aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2002-12-30 01:17:13 +0000
committerUlrich Drepper <drepper@redhat.com>2002-12-30 01:17:13 +0000
commite7da65456b13b1dda22773b028cfe34a1868204b (patch)
tree0895fd58f859c9fc6a982a8513105fdccabf89a0
parentc99dac3600301c1cb9d236466e311694a694c023 (diff)
downloadglibc-e7da65456b13b1dda22773b028cfe34a1868204b.zip
glibc-e7da65456b13b1dda22773b028cfe34a1868204b.tar.gz
glibc-e7da65456b13b1dda22773b028cfe34a1868204b.tar.bz2
Make all functions available by default again. It caused too much trouble.
-rw-r--r--nptl/forward.c92
1 files changed, 43 insertions, 49 deletions
diff --git a/nptl/forward.c b/nptl/forward.c
index 4b7a120..1a73d2c 100644
--- a/nptl/forward.c
+++ b/nptl/forward.c
@@ -29,119 +29,113 @@
struct pthread_functions __libc_pthread_functions attribute_hidden;
-#if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_3_2)
-# define FORWARD4(name, export, rettype, decl, params, defaction, version) \
+#define FORWARD3(name, export, rettype, decl, params, defaction) \
rettype \
-__noexport_##name decl \
+name decl \
{ \
if (__libc_pthread_functions.ptr_##name == NULL) \
defaction; \
\
return __libc_pthread_functions.ptr_##name params; \
-} \
-compat_symbol (libc, __noexport_##name, export, version)
+}
-# define FORWARD3(name, rettype, decl, params, defaction, version) \
- FORWARD4 (name, name, rettype, decl, params, defaction, version)
+#define FORWARD2(name, decl, params, defretval) \
+ FORWARD3 (name, name, int, decl, params, return defretval)
-# define FORWARD2(name, decl, params, defretval, version) \
- FORWARD3 (name, int, decl, params, return defretval, version)
+#define FORWARD(name, decl, params, defretval) \
+ FORWARD2 (name, decl, params, defretval)
-# define FORWARD(name, decl, params, defretval) \
- FORWARD2 (name, decl, params, defretval, GLIBC_2_0)
-
-FORWARD (pthread_attr_destroy, (pthread_attr_t *attr), (attr), 0);
+FORWARD (pthread_attr_destroy, (pthread_attr_t *attr), (attr), 0)
#if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_1)
-FORWARD4 (pthread_attr_init_2_0, pthread_attr_init, int,
- (pthread_attr_t *attr), (attr), return 0, GLIBC_2_0);
+FORWARD3 (pthread_attr_init_2_0, __pthread_attr_init_2_0, int,
+ (pthread_attr_t *attr), (attr), return 0)
+compat_symbol (libc, pthread_attr_init_2_0, pthread_attr_init, GLIBC_2_0);
#endif
-FORWARD4 (pthread_attr_init_2_1, pthread_attr_init, int,
- (pthread_attr_t *attr), (attr), return 0, GLIBC_2_1);
+FORWARD3 (pthread_attr_init_2_1, __pthread_attr_init_2_1, int,
+ (pthread_attr_t *attr), (attr), return 0)
+versioned_symbol (libc, __pthread_attr_init_2_1, pthread_attr_init, GLIBC_2_1);
FORWARD (pthread_attr_getdetachstate,
(const pthread_attr_t *attr, int *detachstate), (attr, detachstate),
- 0);
+ 0)
FORWARD (pthread_attr_setdetachstate, (pthread_attr_t *attr, int detachstate),
- (attr, detachstate), 0);
+ (attr, detachstate), 0)
FORWARD (pthread_attr_getinheritsched,
- (const pthread_attr_t *attr, int *inherit), (attr, inherit), 0);
+ (const pthread_attr_t *attr, int *inherit), (attr, inherit), 0)
FORWARD (pthread_attr_setinheritsched, (pthread_attr_t *attr, int inherit),
- (attr, inherit), 0);
+ (attr, inherit), 0)
FORWARD (pthread_attr_getschedparam,
(const pthread_attr_t *attr, struct sched_param *param),
- (attr, param), 0);
+ (attr, param), 0)
FORWARD (pthread_attr_setschedparam,
(pthread_attr_t *attr, const struct sched_param *param),
- (attr, param), 0);
+ (attr, param), 0)
FORWARD (pthread_attr_getschedpolicy,
- (const pthread_attr_t *attr, int *policy), (attr, policy), 0);
+ (const pthread_attr_t *attr, int *policy), (attr, policy), 0)
FORWARD (pthread_attr_setschedpolicy, (pthread_attr_t *attr, int policy),
- (attr, policy), 0);
+ (attr, policy), 0)
FORWARD (pthread_attr_getscope,
- (const pthread_attr_t *attr, int *scope), (attr, scope), 0);
+ (const pthread_attr_t *attr, int *scope), (attr, scope), 0)
FORWARD (pthread_attr_setscope, (pthread_attr_t *attr, int scope),
- (attr, scope), 0);
+ (attr, scope), 0)
-FORWARD (pthread_condattr_destroy, (pthread_condattr_t *attr), (attr), 0);
-FORWARD (pthread_condattr_init, (pthread_condattr_t *attr), (attr), 0);
+FORWARD (pthread_condattr_destroy, (pthread_condattr_t *attr), (attr), 0)
+FORWARD (pthread_condattr_init, (pthread_condattr_t *attr), (attr), 0)
-FORWARD (pthread_cond_broadcast, (pthread_cond_t *cond), (cond), 0);
+FORWARD (pthread_cond_broadcast, (pthread_cond_t *cond), (cond), 0)
-FORWARD (pthread_cond_destroy, (pthread_cond_t *cond), (cond), 0);
+FORWARD (pthread_cond_destroy, (pthread_cond_t *cond), (cond), 0)
FORWARD (pthread_cond_init,
(pthread_cond_t *cond, const pthread_condattr_t *cond_attr),
- (cond, cond_attr), 0);
+ (cond, cond_attr), 0)
-FORWARD (pthread_cond_signal, (pthread_cond_t *cond), (cond), 0);
+FORWARD (pthread_cond_signal, (pthread_cond_t *cond), (cond), 0)
FORWARD (pthread_cond_wait, (pthread_cond_t *cond, pthread_mutex_t *mutex),
- (cond, mutex), 0);
+ (cond, mutex), 0)
FORWARD (pthread_equal, (pthread_t thread1, pthread_t thread2),
- (thread1, thread2), 1);
+ (thread1, thread2), 1)
-FORWARD3 (pthread_exit, void, (void *retval), (retval), exit (EXIT_SUCCESS),
- GLIBC_2_0);
+FORWARD3 (pthread_exit, pthread_exit, void, (void *retval), (retval),
+ exit (EXIT_SUCCESS))
FORWARD (pthread_getschedparam,
(pthread_t target_thread, int *policy, struct sched_param *param),
- (target_thread, policy, param), 0);
+ (target_thread, policy, param), 0)
FORWARD (pthread_setschedparam,
(pthread_t target_thread, int policy,
- const struct sched_param *param), (target_thread, policy, param), 0);
+ const struct sched_param *param), (target_thread, policy, param), 0)
-FORWARD (pthread_mutex_destroy, (pthread_mutex_t *mutex), (mutex), 0);
+FORWARD (pthread_mutex_destroy, (pthread_mutex_t *mutex), (mutex), 0)
FORWARD (pthread_mutex_init,
(pthread_mutex_t *mutex, const pthread_mutexattr_t *mutexattr),
- (mutex, mutexattr), 0);
+ (mutex, mutexattr), 0)
-FORWARD (pthread_mutex_lock, (pthread_mutex_t *mutex), (mutex), 0);
+FORWARD (pthread_mutex_lock, (pthread_mutex_t *mutex), (mutex), 0)
-FORWARD (pthread_mutex_unlock, (pthread_mutex_t *mutex), (mutex), 0);
+FORWARD (pthread_mutex_unlock, (pthread_mutex_t *mutex), (mutex), 0)
-FORWARD3 (pthread_self, pthread_t, (void), (), return 0, GLIBC_2_0);
+FORWARD3 (pthread_self, pthread_self, pthread_t, (void), (), return 0)
FORWARD (pthread_setcancelstate, (int state, int *oldstate), (state, oldstate),
- 0);
-
-FORWARD (pthread_setcanceltype, (int type, int *oldtype), (type, oldtype), 0);
+ 0)
-
-#endif
+FORWARD (pthread_setcanceltype, (int type, int *oldtype), (type, oldtype), 0)