From 5aa60db21b545797f47808603c97ffc168a45dd9 Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Mon, 19 Mar 2018 01:07:44 +0100 Subject: 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 instead of --- sysdeps/pthread/pthread.h | 22 ---------------------- sysdeps/pthread/pthreadP.h | 18 ++++++++++++++++++ 2 files changed, 18 insertions(+), 22 deletions(-) delete mode 100644 sysdeps/pthread/pthread.h (limited to 'sysdeps/pthread') 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 - -/* 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 +/* 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 */ -- cgit v1.2.3