diff options
Diffstat (limited to 'linuxthreads')
| -rw-r--r-- | linuxthreads/errno.c | 9 | ||||
| -rw-r--r-- | linuxthreads/sysdeps/pthread/tst-timer.c | 17 | ||||
| -rw-r--r-- | linuxthreads/wrapsyscall.c | 12 |
3 files changed, 20 insertions, 18 deletions
diff --git a/linuxthreads/errno.c b/linuxthreads/errno.c index 57b1ebb635..5c0e8767a1 100644 --- a/linuxthreads/errno.c +++ b/linuxthreads/errno.c @@ -23,20 +23,23 @@ #if !USE_TLS || !HAVE___THREAD /* The definition in libc is sufficient if we use TLS. */ -int * __errno_location() +int * +__errno_location (void) { pthread_descr self = thread_self(); return THREAD_GETMEM (self, p_errnop); } -int * __h_errno_location() +int * +__h_errno_location (void) { pthread_descr self = thread_self(); return THREAD_GETMEM (self, p_h_errnop); } /* Return thread specific resolver state. */ -struct __res_state * __res_state() +struct __res_state * +__res_state (void) { pthread_descr self = thread_self(); return THREAD_GETMEM (self, p_resp); diff --git a/linuxthreads/sysdeps/pthread/tst-timer.c b/linuxthreads/sysdeps/pthread/tst-timer.c index 803b411b5a..73e2aab0e7 100644 --- a/linuxthreads/sysdeps/pthread/tst-timer.c +++ b/linuxthreads/sysdeps/pthread/tst-timer.c @@ -1,5 +1,5 @@ /* Tests for POSIX timer implementation. - Copyright (C) 2000 Free Software Foundation, Inc. + Copyright (C) 2000, 2002 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Kaz Kylheku <kaz@ashi.footprints.net>. @@ -66,17 +66,7 @@ main (void) .sigev_notify = SIGEV_SIGNAL, .sigev_signo = ZSIGALRM }; - struct sigevent sigev2 = - { - .sigev_notify = SIGEV_THREAD, - ._sigev_un = - { - ._sigev_thread = - { - ._function = notify_func - } - } - }; + struct sigevent sigev2; struct itimerspec itimer1 = { { 0, 200000000 }, { 0, 200000000 } }; struct itimerspec itimer2 = { { 0, 100000000 }, { 0, 500000000 } }; struct itimerspec itimer3 = { { 0, 150000000 }, { 0, 300000000 } }; @@ -84,6 +74,9 @@ main (void) retval = clock_gettime (CLOCK_REALTIME, &ts); + sigev2.sigev_notify = SIGEV_THREAD; + sigev2.sigev_notify_function = notify_func; + setvbuf (stdout, 0, _IOLBF, 0); printf ("clock_gettime returned %d, timespec = { %ld, %ld }\n", diff --git a/linuxthreads/wrapsyscall.c b/linuxthreads/wrapsyscall.c index 5b92cde15f..c5180355b2 100644 --- a/linuxthreads/wrapsyscall.c +++ b/linuxthreads/wrapsyscall.c @@ -1,5 +1,5 @@ /* Wrapper arpund system calls to provide cancelation points. - Copyright (C) 1996,1997,1998,1999,2000,2001 Free Software Foundation, Inc. + Copyright (C) 1996-1999,2000-2002 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996. @@ -69,6 +69,8 @@ name param_list \ return result; \ } +#define PROMOTE_INTEGRAL_TYPE(type) __typeof__ ((type) 0 + 0) + /* close(2). */ CANCELABLE_SYSCALL (int, close, (int fd), (fd)) @@ -110,13 +112,17 @@ strong_alias (nanosleep, __nanosleep) /* open(2). */ CANCELABLE_SYSCALL_VA (int, open, (const char *pathname, int flags, ...), - (pathname, flags, va_arg (ap, mode_t)), flags) + (pathname, flags, + va_arg (ap, PROMOTE_INTEGRAL_TYPE (mode_t))), + flags) strong_alias (open, __open) /* open64(3). */ CANCELABLE_SYSCALL_VA (int, open64, (const char *pathname, int flags, ...), - (pathname, flags, va_arg (ap, mode_t)), flags) + (pathname, flags, + va_arg (ap, PROMOTE_INTEGRAL_TYPE (mode_t))), + flags) strong_alias (open64, __open64) |