projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix the type of CLOCKS_PER_SEC to match new clock_t type
[musl]
/
src
/
time
/
timer_create.c
diff --git
a/src/time/timer_create.c
b/src/time/timer_create.c
index
6cff16f
..
f76b9ef
100644
(file)
--- a/
src/time/timer_create.c
+++ b/
src/time/timer_create.c
@@
-1,4
+1,5
@@
#include <time.h>
#include <time.h>
+#include <setjmp.h>
#include "pthread_impl.h"
struct ksigevent {
#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);
.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)
}
static void *start(void *arg)
@@
-75,7
+77,7
@@
static void *start(void *arg)
return 0;
}
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;
{
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;
}
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);
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;
}
pthread_cancel(td);
return -1;
}
- td->result = (void *)timerid;
+ td->result = (void *)
(intptr_t)
timerid;
*res = td;
break;
default:
*res = td;
break;
default: