diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2015-02-14 23:04:02 -0600 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2015-02-14 23:04:02 -0600 |
| commit | e1e46622ac0fce73d802fa4a8a2e83cc25cd9e7a (patch) | |
| tree | 2c8d14e4dcc733f4227f0984ed05da5826b13acd /libpthread/linuxthreads/forward.c | |
| parent | 6b6ede3d15f04fe825cfa9f697507457e3640344 (diff) | |
Revert "resolve merge"
This reverts commit 6b6ede3d15f04fe825cfa9f697507457e3640344.
Diffstat (limited to 'libpthread/linuxthreads/forward.c')
| -rw-r--r-- | libpthread/linuxthreads/forward.c | 31 |
1 files changed, 1 insertions, 30 deletions
diff --git a/libpthread/linuxthreads/forward.c b/libpthread/linuxthreads/forward.c index 5a1771b90..486d254dc 100644 --- a/libpthread/linuxthreads/forward.c +++ b/libpthread/linuxthreads/forward.c @@ -21,36 +21,11 @@ #include <dlfcn.h> /* psm: keep this before internals.h */ -#if 0 -vda: here is why: -headers contain libc_hidden_proto(foo). -In libpthread/linuxthreads.old/sysdeps/pthread/bits/libc-lock.h -adding libc_hidden_proto(foo) just before weak_extern (__pthread_initialize) -will not warn: - /* libc_hidden_proto(foo) */ - weak_extern (__pthread_initialize) - /* libc_hidden_proto(foo) */ -but adding after will! Which is extremely strange - -weak_extern expands into just "#pragma weak __pthread_initialize". -TODO: determine whether it is a gcc bug or what -(see gcc.gnu.org/PR36282). -For now, just include all headers before internals.h -(they are again included in internals.h - maybe remove them there later) -#endif - -#include <string.h> -#include <limits.h> -#include <setjmp.h> -#include <signal.h> -#include <unistd.h> -#include <sys/types.h> -#include <sys/wait.h> -#include <sys/time.h> #include "internals.h" /* Pointers to the libc functions. */ -struct pthread_functions __libc_pthread_functions attribute_hidden; +struct pthread_functions __libc_pthread_functions; # define FORWARD2(name, rettype, decl, params, defaction) \ @@ -162,12 +137,8 @@ FORWARD (pthread_setcancelstate, (int state, int *oldstate), (state, oldstate), FORWARD (pthread_setcanceltype, (int type, int *oldtype), (type, oldtype), 0) -#if 0 FORWARD2 (_pthread_cleanup_push, void, (struct _pthread_cleanup_buffer * buffer, void (*routine)(void *), void * arg), (buffer, routine, arg), return) -#endif FORWARD2 (_pthread_cleanup_push_defer, void, (struct _pthread_cleanup_buffer * buffer, void (*routine)(void *), void * arg), (buffer, routine, arg), return) -#if 0 FORWARD2 (_pthread_cleanup_pop, void, (struct _pthread_cleanup_buffer * buffer, int execute), (buffer, execute), return) -#endif FORWARD2 (_pthread_cleanup_pop_restore, void, (struct _pthread_cleanup_buffer * buffer, int execute), (buffer, execute), return) |