From 1f003810c22ca758bcf9c83b2f1f4755d74c47e1 Mon Sep 17 00:00:00 2001 From: nobu Date: Tue, 6 Feb 2018 01:42:38 +0000 Subject: thread_pthread.c: cast inside rb_thread_create_mjit_thread * thread_pthread.c (rb_thread_create_mjit_thread): cast worker_func pointer to void pointer inside. adjusted to the declaration in mjit.c and the definition in thread_win32.c. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@62242 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- mjit.c | 2 +- thread_pthread.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mjit.c b/mjit.c index 5632f633db..a02a020507 100644 --- a/mjit.c +++ b/mjit.c @@ -1198,7 +1198,7 @@ mjit_init(struct mjit_options *opts) /* Initialize worker thread */ finish_worker_p = FALSE; worker_finished = FALSE; - if (rb_thread_create_mjit_thread(child_after_fork, (void *)worker) == FALSE) { + if (!rb_thread_create_mjit_thread(child_after_fork, worker)) { mjit_init_p = FALSE; rb_native_mutex_destroy(&mjit_engine_mutex); rb_native_cond_destroy(&mjit_pch_wakeup); diff --git a/thread_pthread.c b/thread_pthread.c index 1a6cf0c768..3735283c28 100644 --- a/thread_pthread.c +++ b/thread_pthread.c @@ -1791,7 +1791,7 @@ mjit_worker(void *arg) /* Launch MJIT thread. Returns FALSE if it fails to create thread. */ int -rb_thread_create_mjit_thread(void (*child_hook)(void), void *worker_func) +rb_thread_create_mjit_thread(void (*child_hook)(void), void (*worker_func)(void)) { pthread_attr_t attr; pthread_t worker_pid; @@ -1799,7 +1799,7 @@ rb_thread_create_mjit_thread(void (*child_hook)(void), void *worker_func) pthread_atfork(NULL, NULL, child_hook); if (pthread_attr_init(&attr) == 0 && pthread_attr_setscope(&attr, PTHREAD_SCOPE_SYSTEM) == 0 - && pthread_create(&worker_pid, &attr, mjit_worker, worker_func) == 0) { + && pthread_create(&worker_pid, &attr, mjit_worker, (void *)worker_func) == 0) { /* jit_worker thread is not to be joined */ pthread_detach(worker_pid); return TRUE; -- cgit v1.2.3