diff options
| -rw-r--r-- | forward.c | 3 | ||||
| -rw-r--r-- | pthread/pt-initialize.c | 2 | ||||
| -rw-r--r-- | sysdeps/pthread/flockfile.c | 2 | ||||
| -rw-r--r-- | sysdeps/pthread/ftrylockfile.c | 2 | ||||
| -rw-r--r-- | sysdeps/pthread/funlockfile.c | 2 | ||||
| -rw-r--r-- | sysdeps/pthread/libc-lockP.h (renamed from sysdeps/pthread/bits/libc-lockP.h) | 0 | ||||
| -rw-r--r-- | sysdeps/pthread/pthread-functions.h | 2 |
7 files changed, 7 insertions, 6 deletions
@@ -133,8 +133,9 @@ 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); FORWARD (pthread_setcanceltype, (int type, int *oldtype), (type, oldtype), 0) diff --git a/pthread/pt-initialize.c b/pthread/pt-initialize.c index 9e5404b..4435a36 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/flockfile.c b/sysdeps/pthread/flockfile.c index 749a11c..0153a2c 100644 --- a/sysdeps/pthread/flockfile.c +++ b/sysdeps/pthread/flockfile.c @@ -18,7 +18,7 @@ #include <stdio.h> #include <libio.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> void diff --git a/sysdeps/pthread/ftrylockfile.c b/sysdeps/pthread/ftrylockfile.c index 1ae6abc..48420de 100644 --- a/sysdeps/pthread/ftrylockfile.c +++ b/sysdeps/pthread/ftrylockfile.c @@ -19,7 +19,7 @@ #include <errno.h> #include <pthread.h> #include <stdio.h> -#include <bits/stdio-lock.h> +#include <stdio-lock.h> int diff --git a/sysdeps/pthread/funlockfile.c b/sysdeps/pthread/funlockfile.c index 8dda960..78fd211 100644 --- a/sysdeps/pthread/funlockfile.c +++ b/sysdeps/pthread/funlockfile.c @@ -19,7 +19,7 @@ #include <pthread.h> #include <stdio.h> #include <libio.h> -#include <bits/stdio-lock.h> +#include <stdio-lock.h> void diff --git a/sysdeps/pthread/bits/libc-lockP.h b/sysdeps/pthread/libc-lockP.h index 2631e0c..2631e0c 100644 --- a/sysdeps/pthread/bits/libc-lockP.h +++ b/sysdeps/pthread/libc-lockP.h diff --git a/sysdeps/pthread/pthread-functions.h b/sysdeps/pthread/pthread-functions.h index d985dc3..f9e367c 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)); |