diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-03-19 02:27:29 +0100 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-03-19 02:27:29 +0100 |
| commit | 372a613dbe4a85779807040300985fc5289b9fd7 (patch) | |
| tree | f41afa0c9aadfa73e3ff8e022e7faca2ff701692 | |
| parent | c2597197898e29c85dbfd5a10fb05c2428d2ac07 (diff) | |
Move bits/once.h to bits/types/struct___pthread_once.h
* sysdeps/pthread/bits/once.h: Move file to...
* sysdeps/pthread/bits/types/struct___pthread_once.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/pthread/bits/pthreadtypes.h | 2 | ||||
| -rw-r--r-- | sysdeps/pthread/bits/types/struct___pthread_once.h (renamed from sysdeps/pthread/bits/once.h) | 6 |
4 files changed, 6 insertions, 6 deletions
@@ -158,7 +158,7 @@ headers := \ bits/types/struct___pthread_barrierattr.h \ bits/types/struct___pthread_barrier.h \ bits/thread-specific.h \ - bits/once.h \ + bits/types/struct___pthread_once.h \ bits/types/struct___pthread_mutexattr.h \ bits/rwlock.h \ bits/rwlock-attr.h \ diff --git a/sysdeps/generic/pthread.h b/sysdeps/generic/pthread.h index b06bf8b..d123bd2 100644 --- a/sysdeps/generic/pthread.h +++ b/sysdeps/generic/pthread.h @@ -799,7 +799,7 @@ extern int pthread_setspecific (pthread_key_t __key, const void *__value) /* Dynamic package initialization. */ -#include <bits/once.h> +#include <bits/types/struct___pthread_once.h> #define PTHREAD_ONCE_INIT __PTHREAD_ONCE_INIT diff --git a/sysdeps/pthread/bits/pthreadtypes.h b/sysdeps/pthread/bits/pthreadtypes.h index eeb4269..55a5659 100644 --- a/sysdeps/pthread/bits/pthreadtypes.h +++ b/sysdeps/pthread/bits/pthreadtypes.h @@ -125,7 +125,7 @@ typedef struct __pthread_barrier pthread_barrier_t; #include <bits/thread-specific.h> typedef __pthread_key pthread_key_t; -#include <bits/once.h> +#include <bits/types/struct___pthread_once.h> typedef struct __pthread_once pthread_once_t; __END_DECLS diff --git a/sysdeps/pthread/bits/once.h b/sysdeps/pthread/bits/types/struct___pthread_once.h index 610a269..5b99658 100644 --- a/sysdeps/pthread/bits/once.h +++ b/sysdeps/pthread/bits/types/struct___pthread_once.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_ONCE_H -#define _BITS_ONCE_H 1 +#ifndef _BITS_TYPES_STRUCT___PTHREAD_ONCE_H +#define _BITS_TYPES_STRUCT___PTHREAD_ONCE_H 1 #include <bits/types/__pthread_spinlock_t.h> @@ -30,4 +30,4 @@ struct __pthread_once #define __PTHREAD_ONCE_INIT \ (struct __pthread_once) { 0, __PTHREAD_SPIN_LOCK_INITIALIZER } -#endif /* bits/once.h */ +#endif /* bits/types/struct___pthread_once.h */ |