diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2012-08-16 14:03:43 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2012-08-16 14:03:43 +0000 |
| commit | 93a78ac437ba44f493333d7e2a4b0249839ce460 (patch) | |
| tree | be93f2f5a76313d6decc7ccca7623671e23c7974 /nptl/sysdeps/unix/sysv/linux/timer_gettime.c | |
| parent | 4b4f2771c217d7b038bcfc17c985ba057da554db (diff) | |
| download | glibc-93a78ac437ba44f493333d7e2a4b0249839ce460.tar glibc-93a78ac437ba44f493333d7e2a4b0249839ce460.tar.gz glibc-93a78ac437ba44f493333d7e2a4b0249839ce460.tar.bz2 glibc-93a78ac437ba44f493333d7e2a4b0249839ce460.zip | |
Remove __ASSUME_POSIX_TIMERS.
Diffstat (limited to 'nptl/sysdeps/unix/sysv/linux/timer_gettime.c')
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/timer_gettime.c | 56 |
1 files changed, 9 insertions, 47 deletions
diff --git a/nptl/sysdeps/unix/sysv/linux/timer_gettime.c b/nptl/sysdeps/unix/sysv/linux/timer_gettime.c index 1efe2cc91a..6d9933a99c 100644 --- a/nptl/sysdeps/unix/sysv/linux/timer_gettime.c +++ b/nptl/sysdeps/unix/sysv/linux/timer_gettime.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2003 Free Software Foundation, Inc. +/* Copyright (C) 2003-2012 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@redhat.com>, 2003. @@ -24,17 +24,9 @@ #include "kernel-posix-timers.h" -#ifdef __NR_timer_gettime -# ifndef __ASSUME_POSIX_TIMERS -static int compat_timer_gettime (timer_t timerid, struct itimerspec *value); -# define timer_gettime static compat_timer_gettime -# include <nptl/sysdeps/pthread/timer_gettime.c> -# undef timer_gettime -# endif - -# ifdef timer_gettime_alias -# define timer_gettime timer_gettime_alias -# endif +#ifdef timer_gettime_alias +# define timer_gettime timer_gettime_alias +#endif int @@ -42,41 +34,11 @@ timer_gettime (timerid, value) timer_t timerid; struct itimerspec *value; { -# undef timer_gettime -# ifndef __ASSUME_POSIX_TIMERS - if (__no_posix_timers >= 0) -# endif - { - struct timer *kt = (struct timer *) timerid; - - /* Delete the kernel timer object. */ - int res = INLINE_SYSCALL (timer_gettime, 2, kt->ktimerid, value); +#undef timer_gettime + struct timer *kt = (struct timer *) timerid; -# ifndef __ASSUME_POSIX_TIMERS - if (res != -1 || errno != ENOSYS) - { - /* We know the syscall support is available. */ - __no_posix_timers = 1; -# endif - return res; -# ifndef __ASSUME_POSIX_TIMERS - } -# endif + /* Delete the kernel timer object. */ + int res = INLINE_SYSCALL (timer_gettime, 2, kt->ktimerid, value); -# ifndef __ASSUME_POSIX_TIMERS - __no_posix_timers = -1; -# endif - } - -# ifndef __ASSUME_POSIX_TIMERS - return compat_timer_gettime (timerid, value); -# endif + return res; } -#else -# ifdef timer_gettime_alias -# define timer_gettime timer_gettime_alias -# endif -/* The new system calls are not available. Use the userlevel - implementation. */ -# include <nptl/sysdeps/pthread/timer_gettime.c> -#endif |