diff options
| author | Toomas Soome <tsoome@me.com> | 2018-05-30 12:38:16 +0300 |
|---|---|---|
| committer | Hans Rosenfeld <hans.rosenfeld@joyent.com> | 2018-06-04 10:35:16 +0200 |
| commit | ea4ea50f064c5468142b24627acad09a41f060cb (patch) | |
| tree | edd308866e93219b4b0973553d9764cc1dfe8c30 /usr/src/tools/ctf/cvt/ctfmerge.c | |
| parent | a19d2449c7801a22d6c8370a965dab3d16c77925 (diff) | |
| download | illumos-gate-ea4ea50f064c5468142b24627acad09a41f060cb.tar.gz | |
9565 ctf: cast between incompatible function types
Reviewed by: Yuri Pankov <yuripv@yuripv.net>
Reviewed by: Andrew Stormont <andyjstormont@gmail.com>
Reviewed by: John Levon <john.levon@joyent.com>
Approved by: Hans Rosenfeld <rosenfeld@grumpf.hope-2000.org>
Diffstat (limited to 'usr/src/tools/ctf/cvt/ctfmerge.c')
| -rw-r--r-- | usr/src/tools/ctf/cvt/ctfmerge.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/usr/src/tools/ctf/cvt/ctfmerge.c b/usr/src/tools/ctf/cvt/ctfmerge.c index 5706cceb17..1d6d751d99 100644 --- a/usr/src/tools/ctf/cvt/ctfmerge.c +++ b/usr/src/tools/ctf/cvt/ctfmerge.c @@ -504,9 +504,11 @@ worker_runphase2(workqueue_t *wq) /* * Main loop for worker threads. */ -static void -worker_thread(workqueue_t *wq) +static void * +worker_thread(void *ptr) { + workqueue_t *wq = ptr; + worker_runphase1(wq); debug(2, "%d: entering first barrier\n", pthread_self()); @@ -530,6 +532,7 @@ worker_thread(workqueue_t *wq) debug(2, "%d: phase 1 complete\n", pthread_self()); worker_runphase2(wq); + return (NULL); } /* @@ -692,7 +695,7 @@ start_threads(workqueue_t *wq) for (i = 0; i < wq->wq_nthreads; i++) { pthread_create(&wq->wq_thread[i], NULL, - (void *(*)(void *))worker_thread, wq); + worker_thread, wq); } sigset(SIGINT, handle_sig); |