about summary refs log tree commit diff
path: root/nptl
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2004-09-12 20:38:38 +0000
committerUlrich Drepper <drepper@redhat.com>2004-09-12 20:38:38 +0000
commit20f8e6663accb3d318630e8ec4a08ed37521fce6 (patch)
treea780fced9cb6d492f91e89edbefa791a383e8572 /nptl
parentccc63b07082c257ffc6fe0b0bbf770283bb44e98 (diff)
downloadglibc-20f8e6663accb3d318630e8ec4a08ed37521fce6.tar.gz
glibc-20f8e6663accb3d318630e8ec4a08ed37521fce6.tar.xz
glibc-20f8e6663accb3d318630e8ec4a08ed37521fce6.zip
Update.
2004-09-11  Thorsten Kukuk  <kukuk@suse.de>

	* nis/nss_compat/compat-grp.c: Check that buflen is greater zero
	before writing data into the buffer with negative offset.
	* nis/nss_compat/compat-initgroups.c: Likewise.
	* nis/nss_compat/compat-pwd.c: Likewise.
	* nis/nss_compat/compat-spwd.c Likewise.
Diffstat (limited to 'nptl')
-rw-r--r--nptl/sysdeps/pthread/pthread.h18
1 files changed, 9 insertions, 9 deletions
diff --git a/nptl/sysdeps/pthread/pthread.h b/nptl/sysdeps/pthread/pthread.h
index 18ccb83c50..27666483d9 100644
--- a/nptl/sysdeps/pthread/pthread.h
+++ b/nptl/sysdeps/pthread/pthread.h
@@ -83,7 +83,7 @@ enum
 
 
 /* Read-write lock types.  */
-#ifdef __USE_UNIX98
+#if defined __USE_UNIX98 || defined __USE_XOPEN2K
 enum
 {
   PTHREAD_RWLOCK_PREFER_READER_NP,
@@ -91,21 +91,21 @@ enum
   PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP,
   PTHREAD_RWLOCK_DEFAULT_NP = PTHREAD_RWLOCK_PREFER_READER_NP
 };
-#endif  /* Unix98 */
 
 /* Read-write lock initializers.  */
-#define PTHREAD_RWLOCK_INITIALIZER \
+# define PTHREAD_RWLOCK_INITIALIZER \
   { }
-#ifdef __USE_GNU
-# if __WORDSIZE == 64
-#  define PTHREAD_RWLOCK_WRITER_NONRECURSIVE_INITIALIZER_NP \
+# ifdef __USE_GNU
+#  if __WORDSIZE == 64
+#   define PTHREAD_RWLOCK_WRITER_NONRECURSIVE_INITIALIZER_NP \
   { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,					      \
       PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP } }
-# else
-#  define PTHREAD_RWLOCK_WRITER_NONRECURSIVE_INITIALIZER_NP \
+#  else
+#   define PTHREAD_RWLOCK_WRITER_NONRECURSIVE_INITIALIZER_NP \
   { { 0, 0, 0, 0, 0, 0, PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP } }
+#  endif
 # endif
-#endif
+#endif  /* Unix98 or XOpen2K */
 
 
 /* Scheduler inheritance.  */