aboutsummaryrefslogtreecommitdiff
path: root/sysdeps/unix
diff options
context:
space:
mode:
authorAndreas Schwab <schwab@redhat.com>2011-05-23 11:51:12 -0400
committerUlrich Drepper <drepper@gmail.com>2011-05-23 11:51:12 -0400
commitf50ef8f1efdd1f2b040acbb8324604f168e8832a (patch)
tree1f099bd8a0503a06a16ba5b69f0bba72603eceee /sysdeps/unix
parentf2962a71959fd254a7a223437ca4b63b9e81130c (diff)
downloadglibc-f50ef8f1efdd1f2b040acbb8324604f168e8832a.tar
glibc-f50ef8f1efdd1f2b040acbb8324604f168e8832a.tar.gz
glibc-f50ef8f1efdd1f2b040acbb8324604f168e8832a.tar.bz2
glibc-f50ef8f1efdd1f2b040acbb8324604f168e8832a.zip
Fix sysconf compilation for !HP_TIMING_AVAIL archs
Diffstat (limited to 'sysdeps/unix')
-rw-r--r--sysdeps/unix/sysv/linux/ia64/sysconf.c2
-rw-r--r--sysdeps/unix/sysv/linux/sysconf.c6
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 67b8251dd3..732cc68efd 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 e44aa994ee..6e6c69e124 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