X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=src%2Ftime%2Ftimer_create.c;h=f76b9ef8f3e64412621996b020b0dd2b72670543;hp=6cff16fbcc189e16eba3b179a6f289427050e12f;hb=cc11b422864f0eba97f8bc170e2c8275397bdf41;hpb=b1a7102d832220066e7352f40e5744da932f5a28

diff --git a/src/time/timer_create.c b/src/time/timer_create.c
index 6cff16fb..f76b9ef8 100644
--- a/src/time/timer_create.c
+++ b/src/time/timer_create.c
@@ -1,4 +1,5 @@
 #include <time.h>
+#include <setjmp.h>
 #include "pthread_impl.h"
 
 struct ksigevent {
@@ -51,7 +52,8 @@ static void install_handler()
 		.sa_flags = SA_SIGINFO | SA_RESTART
 	};
 	__libc_sigaction(SIGTIMER, &sa, 0);
-	__syscall(SYS_rt_sigprocmask, SIG_UNBLOCK, SIGTIMER_SET, 0, 8);
+	__syscall(SYS_rt_sigprocmask, SIG_UNBLOCK,
+		SIGTIMER_SET, 0, _NSIG/8);
 }
 
 static void *start(void *arg)
@@ -75,7 +77,7 @@ static void *start(void *arg)
 	return 0;
 }
 
-int timer_create(clockid_t clk, struct sigevent *evp, timer_t *res)
+int timer_create(clockid_t clk, struct sigevent *restrict evp, timer_t *restrict res)
 {
 	static pthread_once_t once = PTHREAD_ONCE_INIT;
 	pthread_t td;
@@ -97,7 +99,7 @@ int timer_create(clockid_t clk, struct sigevent *evp, timer_t *res)
 		}
 		if (syscall(SYS_timer_create, clk, ksevp, &timerid) < 0)
 			return -1;
-		*res = (void *)timerid;
+		*res = (void *)(intptr_t)timerid;
 		break;
 	case SIGEV_THREAD:
 		pthread_once(&once, install_handler);
@@ -123,7 +125,7 @@ int timer_create(clockid_t clk, struct sigevent *evp, timer_t *res)
 			pthread_cancel(td);
 			return -1;
 		}
-		td->result = (void *)timerid;
+		td->result = (void *)(intptr_t)timerid;
 		*res = td;
 		break;
 	default: