diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-03-19 01:07:44 +0100 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-03-19 01:35:21 +0100 |
| commit | 5aa60db21b545797f47808603c97ffc168a45dd9 (patch) | |
| tree | ccd0d9654c19f1adb51f3cafaf0dab59f96e5f4d /sysdeps | |
| parent | 13222caf06cce1225122a7ae92d6e782145718ab (diff) | |
Avoid installing private pthread.h
It was actually by mistake that sysdeps/pthread/pthread.h was getting
installed and that we'd have an include/pthread/pthread.h. Let's simplify
this.
* sysdeps/pthread/pthread.h: Move file content to...
* ./sysdeps/pthread/pthreadP.h: ... here.
* sysdeps/generic/pthread/pthread.h: Move file to...
* sysdeps/generic/pthread.h: ... here.
* Makefile (headers): Remove pthread/pthread.h.
* Makeconfig (includes): Remove -I$(..)htl/include.
* pthread/cthreads-compat.c: Include <pthreadP.h> instead of <pthread.h>
Diffstat (limited to 'sysdeps')
| -rw-r--r-- | sysdeps/generic/pthread.h (renamed from sysdeps/generic/pthread/pthread.h) | 0 | ||||
| -rw-r--r-- | sysdeps/pthread/pthread.h | 22 | ||||
| -rw-r--r-- | sysdeps/pthread/pthreadP.h | 18 |
3 files changed, 18 insertions, 22 deletions
diff --git a/sysdeps/generic/pthread/pthread.h b/sysdeps/generic/pthread.h index d2e73c2..d2e73c2 100644 --- a/sysdeps/generic/pthread/pthread.h +++ b/sysdeps/generic/pthread.h diff --git a/sysdeps/pthread/pthread.h b/sysdeps/pthread/pthread.h deleted file mode 100644 index 8e65b05..0000000 --- a/sysdeps/pthread/pthread.h +++ /dev/null @@ -1,22 +0,0 @@ -#ifndef _PTHREAD_H -#include <pthread/pthread.h> - -/* These represent the interface used by glibc itself. */ - -extern int __pthread_mutex_lock (pthread_mutex_t *__mutex); -extern int __pthread_mutex_unlock (pthread_mutex_t *__mutex); - -typedef struct __cthread *__cthread_t; -typedef int __cthread_key_t; -typedef void * (*__cthread_fn_t)(void *__arg); - -__cthread_t __cthread_fork (__cthread_fn_t, void *); -void __cthread_detach (__cthread_t); -int __cthread_keycreate (__cthread_key_t *); -int __cthread_getspecific (__cthread_key_t, void **); -int __cthread_setspecific (__cthread_key_t, void *); - -int __pthread_getattr_np (pthread_t, pthread_attr_t *); -int __pthread_attr_getstack (const pthread_attr_t *, void **, size_t *); - -#endif diff --git a/sysdeps/pthread/pthreadP.h b/sysdeps/pthread/pthreadP.h index fa88d2e..5559fd3 100644 --- a/sysdeps/pthread/pthreadP.h +++ b/sysdeps/pthread/pthreadP.h @@ -20,8 +20,26 @@ #include <pthread.h> +/* These represent the interface used by glibc itself. */ + extern pthread_t __pthread_self (void); extern int __pthread_kill (pthread_t threadid, int signo); extern struct __pthread **__pthread_threads; +extern int __pthread_mutex_lock (pthread_mutex_t *__mutex); +extern int __pthread_mutex_unlock (pthread_mutex_t *__mutex); + +typedef struct __cthread *__cthread_t; +typedef int __cthread_key_t; +typedef void * (*__cthread_fn_t)(void *__arg); + +__cthread_t __cthread_fork (__cthread_fn_t, void *); +void __cthread_detach (__cthread_t); +int __cthread_keycreate (__cthread_key_t *); +int __cthread_getspecific (__cthread_key_t, void **); +int __cthread_setspecific (__cthread_key_t, void *); + +int __pthread_getattr_np (pthread_t, pthread_attr_t *); +int __pthread_attr_getstack (const pthread_attr_t *, void **, size_t *); + #endif /* pthreadP.h */ |