diff options
| author | Mike Zeller <mike@mikezeller.net> | 2020-03-11 16:42:06 -0400 |
|---|---|---|
| committer | Mike Zeller <mike@mikezeller.net> | 2020-03-11 16:42:06 -0400 |
| commit | 2803e163cd303fbc63f832f544bc59c4ee562252 (patch) | |
| tree | c901ef8fa7580dcebfb11316f6bb49d498bd40a8 /usr/src/lib/libfakekernel | |
| parent | dd05dd221f0e26bb86692b7b69c8dbeab8f4c0e5 (diff) | |
| parent | 1de02da27664d38cedeccf227bd4ae92d32619d9 (diff) | |
| download | illumos-joyent-bhyve-sync.tar.gz | |
Merge remote-tracking branch 'origin/master' into bhyve-syncbhyve-sync
Diffstat (limited to 'usr/src/lib/libfakekernel')
| -rw-r--r-- | usr/src/lib/libfakekernel/common/callout.c | 2 | ||||
| -rw-r--r-- | usr/src/lib/libfakekernel/common/thread.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/usr/src/lib/libfakekernel/common/callout.c b/usr/src/lib/libfakekernel/common/callout.c index b2e5048bab..6752e2f44a 100644 --- a/usr/src/lib/libfakekernel/common/callout.c +++ b/usr/src/lib/libfakekernel/common/callout.c @@ -46,7 +46,7 @@ timeout(void (*func)(void *), void *arg, clock_t delta) bzero(&sev, sizeof (sev)); sev.sigev_notify = SIGEV_THREAD; sev.sigev_value.sival_ptr = arg; - sev.sigev_notify_function = (sigev_notify_func_t)func; + sev.sigev_notify_function = (sigev_notify_func_t)(uintptr_t)func; err = timer_create(CLOCK_REALTIME, &sev, &tid); if (err != 0) return (NULL); diff --git a/usr/src/lib/libfakekernel/common/thread.c b/usr/src/lib/libfakekernel/common/thread.c index 7cfac712a8..31421a723b 100644 --- a/usr/src/lib/libfakekernel/common/thread.c +++ b/usr/src/lib/libfakekernel/common/thread.c @@ -70,7 +70,7 @@ thread_create( break; } - thr_func = (void *(*)(void *))func; + thr_func = (void *(*)(void *))(uintptr_t)func; rc = thr_create(NULL, 0, thr_func, arg, thr_flags, &newtid); if (rc != 0) cmn_err(CE_PANIC, "thread_create failed, rc=%d", rc); |