From f9b9f291b7bab3368457d3e273584c25a1ccdc0a Mon Sep 17 00:00:00 2001
From: Ulrich Drepper <drepper@redhat.com>
Date: Sun, 28 Jan 2001 09:13:22 +0000
Subject: Update.

	* conform/conformtest.pl: Define $mustprepend{"stdio.h"}.
	* libio/stdio.h: Always define __need___va_list.
---
 linuxthreads/sysdeps/pthread/bits/initspin.h              | 10 +++++-----
 linuxthreads/sysdeps/pthread/pthread.h                    | 14 +++++++-------
 linuxthreads/sysdeps/unix/sysv/linux/hppa/bits/initspin.h | 10 +++++-----
 3 files changed, 17 insertions(+), 17 deletions(-)

(limited to 'linuxthreads/sysdeps')

diff --git a/linuxthreads/sysdeps/pthread/bits/initspin.h b/linuxthreads/sysdeps/pthread/bits/initspin.h
index 050983c4c1..af19d44e60 100644
--- a/linuxthreads/sysdeps/pthread/bits/initspin.h
+++ b/linuxthreads/sysdeps/pthread/bits/initspin.h
@@ -1,5 +1,5 @@
 /* Generic definitions for spinlock initializers.
-   Copyright (C) 2000 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2001 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
@@ -20,9 +20,9 @@
 /* Initial value of a spinlock.  Most platforms should use zero,
    unless they only implement a "test and clear" operation instead of
    the usual "test and set". */
-#define LT_SPINLOCK_INIT 0
+#define __LT_SPINLOCK_INIT 0
 
 /* Macros for lock initializers, using the above definition. */
-#define LOCK_INITIALIZER { 0, LT_SPINLOCK_INIT }
-#define ALT_LOCK_INITIALIZER { 0, LT_SPINLOCK_INIT }
-#define ATOMIC_INITIALIZER { 0, LT_SPINLOCK_INIT }
+#define __LOCK_INITIALIZER { 0, __LT_SPINLOCK_INIT }
+#define __ALT_LOCK_INITIALIZER { 0, __LT_SPINLOCK_INIT }
+#define __ATOMIC_INITIALIZER { 0, __LT_SPINLOCK_INIT }
diff --git a/linuxthreads/sysdeps/pthread/pthread.h b/linuxthreads/sysdeps/pthread/pthread.h
index 45be6cf2b8..2911da8ef1 100644
--- a/linuxthreads/sysdeps/pthread/pthread.h
+++ b/linuxthreads/sysdeps/pthread/pthread.h
@@ -31,26 +31,26 @@ __BEGIN_DECLS
 /* Initializers.  */
 
 #define PTHREAD_MUTEX_INITIALIZER \
-  {0, 0, 0, PTHREAD_MUTEX_TIMED_NP, LOCK_INITIALIZER}
+  {0, 0, 0, PTHREAD_MUTEX_TIMED_NP, __LOCK_INITIALIZER}
 #ifdef __USE_GNU
 # define PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP \
-  {0, 0, 0, PTHREAD_MUTEX_RECURSIVE_NP, LOCK_INITIALIZER}
+  {0, 0, 0, PTHREAD_MUTEX_RECURSIVE_NP, __LOCK_INITIALIZER}
 # define PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP \
-  {0, 0, 0, PTHREAD_MUTEX_ERRORCHECK_NP, LOCK_INITIALIZER}
+  {0, 0, 0, PTHREAD_MUTEX_ERRORCHECK_NP, __LOCK_INITIALIZER}
 # define PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP \
-  {0, 0, 0, PTHREAD_MUTEX_ADAPTIVE_NP, LOCK_INITIALIZER}
+  {0, 0, 0, PTHREAD_MUTEX_ADAPTIVE_NP, __LOCK_INITIALIZER}
 #endif
 
-#define PTHREAD_COND_INITIALIZER {LOCK_INITIALIZER, 0}
+#define PTHREAD_COND_INITIALIZER {__LOCK_INITIALIZER, 0}
 
 #ifdef __USE_UNIX98
 # define PTHREAD_RWLOCK_INITIALIZER \
-  { LOCK_INITIALIZER, 0, NULL, NULL, NULL,					      \
+  { __LOCK_INITIALIZER, 0, NULL, NULL, NULL,				      \
     PTHREAD_RWLOCK_DEFAULT_NP, PTHREAD_PROCESS_PRIVATE }
 #endif
 #ifdef __USE_GNU
 # define PTHREAD_RWLOCK_WRITER_NONRECURSIVE_INITIALIZER_NP \
-  { LOCK_INITIALIZER, 0, NULL, NULL, NULL,					      \
+  { __LOCK_INITIALIZER, 0, NULL, NULL, NULL,				      \
     PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP, PTHREAD_PROCESS_PRIVATE }
 #endif
 
diff --git a/linuxthreads/sysdeps/unix/sysv/linux/hppa/bits/initspin.h b/linuxthreads/sysdeps/unix/sysv/linux/hppa/bits/initspin.h
index bb8d326348..c3829b12d6 100644
--- a/linuxthreads/sysdeps/unix/sysv/linux/hppa/bits/initspin.h
+++ b/linuxthreads/sysdeps/unix/sysv/linux/hppa/bits/initspin.h
@@ -1,5 +1,5 @@
 /* PA-RISC specific definitions for spinlock initializers.
-   Copyright (C) 2000 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2001 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
@@ -19,9 +19,9 @@
 
 /* Initial value of a spinlock.  PA-RISC only implements atomic load
    and clear so this must be non-zero. */
-#define LT_SPINLOCK_INIT 1
+#define __LT_SPINLOCK_INIT 1
 
 /* Macros for lock initializers, using the above definition. */
-#define LOCK_INITIALIZER { 0, LT_SPINLOCK_INIT }
-#define ALT_LOCK_INITIALIZER { 0, LT_SPINLOCK_INIT }
-#define ATOMIC_INITIALIZER { 0, LT_SPINLOCK_INIT }
+#define __LOCK_INITIALIZER { 0, __LT_SPINLOCK_INIT }
+#define __ALT_LOCK_INITIALIZER { 0, __LT_SPINLOCK_INIT }
+#define __ATOMIC_INITIALIZER { 0, __LT_SPINLOCK_INIT }
-- 
cgit 1.4.1