diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-03-19 02:10:15 +0100 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-03-19 02:10:57 +0100 |
| commit | e900467cf8c98913d56098db688f28bbad883641 (patch) | |
| tree | c2ea2edaecc18b2ab6e6b26f16ef39579d2f9dc7 | |
| parent | 1b2018c046c879e8a83673865dcb27e683eafcfc (diff) | |
Move bits/mutex.h to bits/types/struct___pthread_mutex.h
* sysdeps/mach/hurd/bits/mutex.h: Move file to...
* sysdeps/mach/hurd/bits/types/struct___pthread_mutex.h: ... here.
* sysdeps/pthread/bits/mutex.h: Move file to...
* sysdeps/pthread/bits/types/struct___pthread_mutex.h: ... here.
* Makefile (headers): Update accordingly.
* sysdeps/generic/pthread.h: Likewise.
* sysdeps/pthread/bits/pthreadtypes.h: Likewise.
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | sysdeps/generic/pthread.h | 2 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/bits/types/struct___pthread_mutex.h (renamed from sysdeps/mach/hurd/bits/mutex.h) | 6 | ||||
| -rw-r--r-- | sysdeps/pthread/bits/pthreadtypes.h | 2 | ||||
| -rw-r--r-- | sysdeps/pthread/bits/types/struct___pthread_mutex.h (renamed from sysdeps/pthread/bits/mutex.h) | 6 |
5 files changed, 9 insertions, 9 deletions
@@ -148,7 +148,7 @@ headers := \ bits/pthreadtypes.h \ bits/pthreadtypes-arch.h \ bits/thread-shared-types.h \ - bits/mutex.h \ + bits/types/struct___pthread_mutex.h \ bits/condition.h \ bits/condition-attr.h \ bits/types/__pthread_spinlock_t.h \ diff --git a/sysdeps/generic/pthread.h b/sysdeps/generic/pthread.h index cded1ca..7be770e 100644 --- a/sysdeps/generic/pthread.h +++ b/sysdeps/generic/pthread.h @@ -363,7 +363,7 @@ extern int pthread_mutexattr_settype(pthread_mutexattr_t *__attr, /* Mutexes. */ -#include <bits/mutex.h> +#include <bits/types/struct___pthread_mutex.h> #define PTHREAD_MUTEX_INITIALIZER __PTHREAD_MUTEX_INITIALIZER /* Static initializer for recursive mutexes. */ diff --git a/sysdeps/mach/hurd/bits/mutex.h b/sysdeps/mach/hurd/bits/types/struct___pthread_mutex.h index 2d5625b..c6d356d 100644 --- a/sysdeps/mach/hurd/bits/mutex.h +++ b/sysdeps/mach/hurd/bits/types/struct___pthread_mutex.h @@ -16,8 +16,8 @@ License along with the GNU C Library; see the file COPYING.LIB. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef _BITS_MUTEX_H -#define _BITS_MUTEX_H 1 +#ifndef _BITS_TYPES_STRUCT___PTHREAD_MUTEX_H +#define _BITS_TYPES_STRUCT___PTHREAD_MUTEX_H 1 #include <bits/mutex-attr.h> @@ -46,4 +46,4 @@ struct __pthread_mutex #define __PTHREAD_RECURSIVE_MUTEX_INITIALIZER \ { 0, 0, 0, 0, __PTHREAD_MUTEX_RECURSIVE + 1, 0, 0, 0 } -#endif /* bits/mutex.h */ +#endif /* bits/types/struct___pthread_mutex.h */ diff --git a/sysdeps/pthread/bits/pthreadtypes.h b/sysdeps/pthread/bits/pthreadtypes.h index 574ec63..fe2efc4 100644 --- a/sysdeps/pthread/bits/pthreadtypes.h +++ b/sysdeps/pthread/bits/pthreadtypes.h @@ -88,7 +88,7 @@ enum __pthread_mutex_robustness #include <bits/mutex-attr.h> typedef struct __pthread_mutexattr pthread_mutexattr_t; -#include <bits/mutex.h> +#include <bits/types/struct___pthread_mutex.h> typedef struct __pthread_mutex pthread_mutex_t; #include <bits/condition-attr.h> diff --git a/sysdeps/pthread/bits/mutex.h b/sysdeps/pthread/bits/types/struct___pthread_mutex.h index bd1ad8f..a9265c4 100644 --- a/sysdeps/pthread/bits/mutex.h +++ b/sysdeps/pthread/bits/types/struct___pthread_mutex.h @@ -18,8 +18,8 @@ License along with the GNU C Library; see the file COPYING.LIB. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef _BITS_MUTEX_H -#define _BITS_MUTEX_H 1 +#ifndef _BITS_TYPES_STRUCT___PTHREAD_MUTEX_H +#define _BITS_TYPES_STRUCT___PTHREAD_MUTEX_H 1 #include <bits/types/__pthread_spinlock_t.h> #include <bits/mutex-attr.h> @@ -59,4 +59,4 @@ struct __pthread_mutex { __PTHREAD_SPIN_LOCK_INITIALIZER, __PTHREAD_SPIN_LOCK_INITIALIZER, 0, 0, \ __PTHREAD_RECURSIVE_MUTEXATTR, 0, 0, 0 } -#endif /* bits/mutex.h */ +#endif /* bits/types/struct___pthread_mutex.h */ |