2011-05-23 Andreas Schwab <schwab@redhat.com> * sysdeps/unix/sysv/linux/ia64/sysconf.c (HAS_CPUCLOCK): Add parameter name. * sysdeps/unix/sysv/linux/sysconf.c (has_cpuclock, HAS_CPUCLOCK): Add parameter name. (__sysconf): Pass it down. --- sysdeps/unix/sysv/linux/ia64/sysconf.c | 2 +- sysdeps/unix/sysv/linux/sysconf.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sysdeps/unix/sysv/linux/ia64/sysconf.c b/sysdeps/unix/sysv/linux/ia64/sysconf.c index 67b8251..732cc68 100644 --- a/sysdeps/unix/sysv/linux/ia64/sysconf.c +++ b/sysdeps/unix/sysv/linux/ia64/sysconf.c @@ -24,7 +24,7 @@ #include "has_cpuclock.c" -#define HAS_CPUCLOCK() (has_cpuclock () ? _POSIX_VERSION : -1) +#define HAS_CPUCLOCK(name) (has_cpuclock () ? _POSIX_VERSION : -1) /* Now the generic Linux version. */ diff --git a/sysdeps/unix/sysv/linux/sysconf.c b/sysdeps/unix/sysv/linux/sysconf.c index e44aa99..6e6c69e 100644 --- a/sysdeps/unix/sysv/linux/sysconf.c +++ b/sysdeps/unix/sysv/linux/sysconf.c @@ -37,7 +37,7 @@ static long int posix_sysconf (int name); #ifndef HAS_CPUCLOCK static long int -has_cpuclock (void) +has_cpuclock (int name) { # if defined __NR_clock_getres || HP_TIMING_AVAIL /* If we have HP_TIMING, we will fall back on that if the system @@ -59,7 +59,7 @@ has_cpuclock (void) return -1; # endif } -# define HAS_CPUCLOCK() has_cpuclock () +# define HAS_CPUCLOCK(name) has_cpuclock (name) #endif @@ -86,7 +86,7 @@ __sysconf (int name) case _SC_CPUTIME: case _SC_THREAD_CPUTIME: - return HAS_CPUCLOCK (); + return HAS_CPUCLOCK (name); case _SC_ARG_MAX: #if __LINUX_KERNEL_VERSION < 0x020617 -- 1.7.4.4 -- Andreas Schwab, schwab@redhat.com GPG Key fingerprint = D4E8 DBE3 3813 BB5D FA84 5EC7 45C6 250E 6F00 984E "And now for something completely different."