diff options
author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2016-08-21 01:53:31 +0200 |
---|---|---|
committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2016-08-21 01:53:31 +0200 |
commit | 7887bb77be1661b1233611bba78e21d97b6554f2 (patch) | |
tree | 3defde2ef67f539dde7fc366f92ee13facfdbbc7 | |
parent | 8d36158d88a1caf28bf68edd783e69d4071cb737 (diff) |
Revert "Fix build with 2.22"
This reverts commit edb5bb83ec918dc6b77b3da5b246c056932d78d7.
-rw-r--r-- | forward.c | 2 | ||||
-rw-r--r-- | pthread/pt-initialize.c | 2 | ||||
-rw-r--r-- | sysdeps/pthread/pthread-functions.h | 2 |
3 files changed, 3 insertions, 3 deletions
@@ -132,7 +132,7 @@ FORWARD (pthread_mutex_unlock, (pthread_mutex_t *mutex), (mutex), 0) FORWARD2 (pthread_self, pthread_t, (void), (), return 0) -FORWARD (__pthread_setcancelstate, (int state, int *oldstate), (state, oldstate), +FORWARD (pthread_setcancelstate, (int state, int *oldstate), (state, oldstate), 0) strong_alias (__pthread_setcancelstate, pthread_setcancelstate); diff --git a/pthread/pt-initialize.c b/pthread/pt-initialize.c index 4435a36..9e5404b 100644 --- a/pthread/pt-initialize.c +++ b/pthread/pt-initialize.c @@ -61,7 +61,7 @@ static const struct pthread_functions pthread_functions = .ptr_pthread_mutex_trylock = __pthread_mutex_trylock, .ptr_pthread_mutex_unlock = __pthread_mutex_unlock, .ptr_pthread_self = __pthread_self, - .ptr___pthread_setcancelstate = __pthread_setcancelstate, + .ptr_pthread_setcancelstate = __pthread_setcancelstate, .ptr_pthread_setcanceltype = __pthread_setcanceltype, .ptr___pthread_get_cleanup_stack = __pthread_get_cleanup_stack, .ptr_pthread_once = __pthread_once, diff --git a/sysdeps/pthread/pthread-functions.h b/sysdeps/pthread/pthread-functions.h index f9e367c..d985dc3 100644 --- a/sysdeps/pthread/pthread-functions.h +++ b/sysdeps/pthread/pthread-functions.h @@ -114,7 +114,7 @@ struct pthread_functions int (*ptr_pthread_mutex_trylock) (pthread_mutex_t *); int (*ptr_pthread_mutex_unlock) (pthread_mutex_t *); pthread_t (*ptr_pthread_self) (void); - int (*ptr___pthread_setcancelstate) (int, int *); + int (*ptr_pthread_setcancelstate) (int, int *); int (*ptr_pthread_setcanceltype) (int, int *); struct __pthread_cancelation_handler **(*ptr___pthread_get_cleanup_stack) (void); int (*ptr_pthread_once) (pthread_once_t *, void (*) (void)); |