about summary refs log tree commit diff
path: root/nscd/connections.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2004-10-04 19:28:07 +0000
committerUlrich Drepper <drepper@redhat.com>2004-10-04 19:28:07 +0000
commit94d824f920209243c72eb4a6fedbb5a039be2af3 (patch)
treebbd2b74f817b833d5b7e4c776927329bec5d353e /nscd/connections.c
parent3078cba2f7272dab753c45b733af2e693e86d83c (diff)
downloadglibc-94d824f920209243c72eb4a6fedbb5a039be2af3.tar.gz
glibc-94d824f920209243c72eb4a6fedbb5a039be2af3.tar.xz
glibc-94d824f920209243c72eb4a6fedbb5a039be2af3.zip
Update.
	* sysdeps/unix/sysv/linux/ia64/sysconf.c: New file.
	* sysdeps/unix/sysv/linux/ia64/Dist: Add has_cpuclock.c.
	* sysdeps/unix/sysv/linux/ia64/clock_getcpuclockid.c: Move actual
	testing code to...
	* sysdeps/unix/sysv/linux/ia64/has_cpuclock.c: ...here.  New file.
	* sysdeps/unix/sysv/linux/i386/sysconf.c: Add dynamic check for
	_SC_CPUTIME and _SC_THREAD_CPUTIME.
Diffstat (limited to 'nscd/connections.c')
-rw-r--r--nscd/connections.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/nscd/connections.c b/nscd/connections.c
index aae798ed47..594a5b8950 100644
--- a/nscd/connections.c
+++ b/nscd/connections.c
@@ -1459,16 +1459,15 @@ start_threads (void)
     && defined _POSIX_MONOTONIC_CLOCK && _POSIX_MONOTONIC_CLOCK >= 0
   /* Determine whether the monotonous clock is available.  */
   struct timespec dummy;
-  if (
 # if _POSIX_MONOTONIC_CLOCK == 0
-      sysconf (_SC_MONOTONIC_CLOCK) > 0 &&
+  if (sysconf (_SC_MONOTONIC_CLOCK) > 0)
 # endif
 # if _POSIX_CLOCK_SELECTION == 0
-      sysconf (_SC_CLOCK_SELECTION) > 0 &&
+    if (sysconf (_SC_CLOCK_SELECTION) > 0)
 # endif
-      clock_getres (CLOCK_MONOTONIC, &dummy) == 0
-      && pthread_condattr_setclock (&condattr, CLOCK_MONOTONIC) == 0)
-    timeout_clock = CLOCK_MONOTONIC;
+      if (clock_getres (CLOCK_MONOTONIC, &dummy) == 0
+	  && pthread_condattr_setclock (&condattr, CLOCK_MONOTONIC) == 0)
+	timeout_clock = CLOCK_MONOTONIC;
 #endif
 
   pthread_cond_init (&readylist_cond, &condattr);