From: Ulrich Drepper <drepper@redhat.com>
Date: Sat, 17 May 2003 00:38:41 +0000 (+0000)
Subject: Update.
X-Git-Tag: cvs/glibc-2_3_3~719
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=23ae64517447a0b11ea4102a29c0d18f8f5949d0;p=thirdparty%2Fglibc.git

Update.

	* include/features.h (__USE_XOPEN2K): Define also for
	_POSIX_C_SOURCE>=200112L.
---

diff --git a/ChangeLog b/ChangeLog
index 44e4bb74fcc..bef0e345081 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2003-05-16  Ulrich Drepper  <drepper@redhat.com>
 
+	* include/features.h (__USE_XOPEN2K): Define also for
+	_POSIX_C_SOURCE>=200112L.
+
 	* sysdeps/unix/sysv/linux/sigwaitinfo.c (do_sigwaitinfo): Fold
 	SI_TKILL code into SI_USER.
 	* sysdeps/unix/sysv/linux/sigtimedwait.c (do_sigtimedwait): Likewise.
diff --git a/include/features.h b/include/features.h
index 5e39b7fcc95..f9735dc66fc 100644
--- a/include/features.h
+++ b/include/features.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-1993,1995-2000,2001,2002 Free Software Foundation, Inc.
+/* Copyright (C) 1991-1993,1995-2002, 2003   Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -188,6 +188,10 @@
 # define __USE_POSIX199506	1
 #endif
 
+#if (_POSIX_C_SOURCE - 0) >= 200112L
+# define __USE_XOPEN2K		1
+#endif
+
 #ifdef	_XOPEN_SOURCE
 # define __USE_XOPEN	1
 # if (_XOPEN_SOURCE - 0) >= 500
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 60b03f764d9..d753b95fbb5 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,5 +1,11 @@
 2003-05-16  Ulrich Drepper  <drepper@redhat.com>
 
+	* sysdeps/unix/sysv/linux/timer_gettime.c (timer_gettime): Correct
+	test for syscall availability.
+
+	* sysdeps/unix/sysv/linux/timer_settime.c (timer_settime): Set
+	__no_posix_timers to -1 if the syscalls don't exist.
+
 	* pthread_join.c (pthread_join): Set tid field of the joined
 	thread to -1.  This isn't necessary but helps to recognize some
 	error conditions with almost no cost.
diff --git a/nptl/sysdeps/unix/sysv/linux/timer_gettime.c b/nptl/sysdeps/unix/sysv/linux/timer_gettime.c
index 6da15718edd..9066e1077f4 100644
--- a/nptl/sysdeps/unix/sysv/linux/timer_gettime.c
+++ b/nptl/sysdeps/unix/sysv/linux/timer_gettime.c
@@ -44,7 +44,7 @@ timer_gettime (timerid, value)
 {
 # undef timer_gettime
 # ifndef __ASSUME_POSIX_TIMERS
-  if (__no_posix_timers == 0)
+  if (__no_posix_timers >= 0)
 # endif
     {
       struct timer *kt = (struct timer *) timerid;
diff --git a/nptl/sysdeps/unix/sysv/linux/timer_settime.c b/nptl/sysdeps/unix/sysv/linux/timer_settime.c
index 37ebf1dd537..50ebb193a09 100644
--- a/nptl/sysdeps/unix/sysv/linux/timer_settime.c
+++ b/nptl/sysdeps/unix/sysv/linux/timer_settime.c
@@ -67,7 +67,7 @@ timer_settime (timerid, flags, value, ovalue)
 # endif
 
 # ifndef __ASSUME_POSIX_TIMERS
-      __no_posix_timers = 1;
+      __no_posix_timers = -1;
 # endif
     }