Update.

2002-12-30  Jakub Jelinek  <jakub@redhat.com>

	* forward.c (FORWARD2): Renamed from FORWARD3.  Remove unused export
	argument.
	(pthread_attr_init_2_0, pthread_attr_init_2_1): Use FORWARD macro.
	(pthread_exit): Use strong_alias to avoid warnings.
	* pthreadP.h (struct pthread_functions): Rename ptr_pthread_exit
	and ptr_pthread_attr_init_2_* to ptr___pthread_exit and
	ptr___pthread_attr_init_2_*.
	* init.c (pthread_functions): Adjust.

4 files changed, 25 insertions, 18 deletions

diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 0d75339175..5b320962df 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,14 @@
+2002-12-30  Jakub Jelinek  <jakub@redhat.com>
+
+	* forward.c (FORWARD2): Renamed from FORWARD3.  Remove unused export
+	argument.
+	(pthread_attr_init_2_0, pthread_attr_init_2_1): Use FORWARD macro.
+	(pthread_exit): Use strong_alias to avoid warnings.
+	* pthreadP.h (struct pthread_functions): Rename ptr_pthread_exit
+	and ptr_pthread_attr_init_2_* to ptr___pthread_exit and
+	ptr___pthread_attr_init_2_*.
+	* init.c (pthread_functions): Adjust.
+
 2002-12-29  Ulrich Drepper  <drepper@redhat.com>
 
 	* forward.c: Make all functions available by default again.  It
diff --git a/nptl/forward.c b/nptl/forward.c
index 1a73d2ce4b..a167bc1027 100644
--- a/nptl/forward.c
+++ b/nptl/forward.c
@@ -29,7 +29,7 @@
 struct pthread_functions __libc_pthread_functions attribute_hidden;
 
 
-#define FORWARD3(name, export, rettype, decl, params, defaction) \
+#define FORWARD2(name, rettype, decl, params, defaction) \
 rettype									      \
 name decl								      \
 {									      \
@@ -39,23 +39,18 @@ name decl								      \
   return __libc_pthread_functions.ptr_##name params;			      \
 }
 
-#define FORWARD2(name, decl, params, defretval) \
-  FORWARD3 (name, name, int, decl, params, return defretval)
-
 #define FORWARD(name, decl, params, defretval) \
-  FORWARD2 (name, decl, params, defretval)
+  FORWARD2 (name, int, decl, params, return defretval)
 
 
 FORWARD (pthread_attr_destroy, (pthread_attr_t *attr), (attr), 0)
 
 #if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_1)
-FORWARD3 (pthread_attr_init_2_0, __pthread_attr_init_2_0, int,
-	  (pthread_attr_t *attr), (attr), return 0)
+FORWARD (__pthread_attr_init_2_0, (pthread_attr_t *attr), (attr), 0)
 compat_symbol (libc, pthread_attr_init_2_0, pthread_attr_init, GLIBC_2_0);
 #endif
 
-FORWARD3 (pthread_attr_init_2_1, __pthread_attr_init_2_1, int,
-	  (pthread_attr_t *attr), (attr), return 0)
+FORWARD (__pthread_attr_init_2_1, (pthread_attr_t *attr), (attr), 0)
 versioned_symbol (libc, __pthread_attr_init_2_1, pthread_attr_init, GLIBC_2_1);
 
 FORWARD (pthread_attr_getdetachstate,
@@ -109,8 +104,9 @@ FORWARD (pthread_equal, (pthread_t thread1, pthread_t thread2),
 	 (thread1, thread2), 1)
 
 
-FORWARD3 (pthread_exit, pthread_exit, void, (void *retval), (retval),
-	  exit (EXIT_SUCCESS))
+/* Use an alias to avoid warning, as pthread_exit is declared noreturn.  */
+FORWARD2 (__pthread_exit, void, (void *retval), (retval), exit (EXIT_SUCCESS))
+strong_alias (__pthread_exit, pthread_exit);
 
 
 FORWARD (pthread_getschedparam,
@@ -132,7 +128,7 @@ FORWARD (pthread_mutex_lock, (pthread_mutex_t *mutex), (mutex), 0)
 FORWARD (pthread_mutex_unlock, (pthread_mutex_t *mutex), (mutex), 0)
 
 
-FORWARD3 (pthread_self, pthread_self, pthread_t, (void), (), return 0)
+FORWARD2 (pthread_self, pthread_t, (void), (), return 0)
 
 
 FORWARD (pthread_setcancelstate, (int state, int *oldstate), (state, oldstate),
diff --git a/nptl/init.c b/nptl/init.c
index 39cf41ee9b..8da87c5dce 100644
--- a/nptl/init.c
+++ b/nptl/init.c
@@ -56,8 +56,8 @@ extern void __libc_setup_tls (size_t tcbsize, size_t tcbalign);
 static struct pthread_functions pthread_functions =
   {
     .ptr_pthread_attr_destroy = __pthread_attr_destroy,
-    .ptr_pthread_attr_init_2_0 = __pthread_attr_init_2_0,
-    .ptr_pthread_attr_init_2_1 = __pthread_attr_init_2_1,
+    .ptr___pthread_attr_init_2_0 = __pthread_attr_init_2_0,
+    .ptr___pthread_attr_init_2_1 = __pthread_attr_init_2_1,
     .ptr_pthread_attr_getdetachstate = __pthread_attr_getdetachstate,
     .ptr_pthread_attr_setdetachstate = __pthread_attr_setdetachstate,
     .ptr_pthread_attr_getinheritsched = __pthread_attr_getinheritsched,
@@ -76,7 +76,7 @@ static struct pthread_functions pthread_functions =
     .ptr_pthread_cond_signal = __pthread_cond_signal,
     .ptr_pthread_cond_wait = __pthread_cond_wait,
     .ptr_pthread_equal = __pthread_equal,
-    .ptr_pthread_exit = __pthread_exit,
+    .ptr___pthread_exit = __pthread_exit,
     .ptr_pthread_getschedparam = __pthread_getschedparam,
     .ptr_pthread_setschedparam = __pthread_setschedparam,
     .ptr_pthread_mutex_destroy = INTUSE(__pthread_mutex_destroy),
diff --git a/nptl/pthreadP.h b/nptl/pthreadP.h
index 482c535434..eb5c6d4106 100644
--- a/nptl/pthreadP.h
+++ b/nptl/pthreadP.h
@@ -72,8 +72,8 @@ extern int __pthread_debug attribute_hidden;
 struct pthread_functions
 {
   int (*ptr_pthread_attr_destroy) (pthread_attr_t *);
-  int (*ptr_pthread_attr_init_2_0) (pthread_attr_t *);
-  int (*ptr_pthread_attr_init_2_1) (pthread_attr_t *);
+  int (*ptr___pthread_attr_init_2_0) (pthread_attr_t *);
+  int (*ptr___pthread_attr_init_2_1) (pthread_attr_t *);
   int (*ptr_pthread_attr_getdetachstate) (const pthread_attr_t *, int *);
   int (*ptr_pthread_attr_setdetachstate) (pthread_attr_t *, int);
   int (*ptr_pthread_attr_getinheritsched) (const pthread_attr_t *, int *);
@@ -94,7 +94,7 @@ struct pthread_functions
   int (*ptr_pthread_cond_signal) (pthread_cond_t *);
   int (*ptr_pthread_cond_wait) (pthread_cond_t *, pthread_mutex_t *);
   int (*ptr_pthread_equal) (pthread_t, pthread_t);
-  void (*ptr_pthread_exit) (void *);
+  void (*ptr___pthread_exit) (void *);
   int (*ptr_pthread_getschedparam) (pthread_t, int *, struct sched_param *);
   int (*ptr_pthread_setschedparam) (pthread_t, int,
 				    const struct sched_param *);