diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-03-19 02:21:01 +0100 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-03-19 02:21:01 +0100 |
| commit | 64e55cccfcffd5a47a0dd92a910eefd477809b18 (patch) | |
| tree | ac7366ba6bda6d9e4a0d27162b90d2570612930d | |
| parent | d94e01e61ca3fe2d8c3a0e6ab294baf68b194a14 (diff) | |
Move bits/condition.h to bits/types/struct___pthread_cond.h
* sysdeps/pthread/bits/condition.h: Move file to...
* sysdeps/pthread/bits/types/struct___pthread_cond.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_cond.h (renamed from sysdeps/pthread/bits/condition.h) | 6 |
4 files changed, 6 insertions, 6 deletions
@@ -149,7 +149,7 @@ headers := \ bits/pthreadtypes-arch.h \ bits/thread-shared-types.h \ bits/types/struct___pthread_mutex.h \ - bits/condition.h \ + bits/types/struct___pthread_cond.h \ bits/types/struct___pthread_condattr.h \ bits/types/__pthread_spinlock_t.h \ bits/spin-lock-inline.h \ diff --git a/sysdeps/generic/pthread.h b/sysdeps/generic/pthread.h index 260295f..9603aec 100644 --- a/sysdeps/generic/pthread.h +++ b/sysdeps/generic/pthread.h @@ -480,7 +480,7 @@ extern int pthread_condattr_setpshared (pthread_condattr_t *__attr, /* Condition variables. */ -#include <bits/condition.h> +#include <bits/types/struct___pthread_cond.h> #define PTHREAD_COND_INITIALIZER __PTHREAD_COND_INITIALIZER diff --git a/sysdeps/pthread/bits/pthreadtypes.h b/sysdeps/pthread/bits/pthreadtypes.h index f874219..59ab32a 100644 --- a/sysdeps/pthread/bits/pthreadtypes.h +++ b/sysdeps/pthread/bits/pthreadtypes.h @@ -94,7 +94,7 @@ typedef struct __pthread_mutex pthread_mutex_t; #include <bits/types/struct___pthread_condattr.h> typedef struct __pthread_condattr pthread_condattr_t; -#include <bits/condition.h> +#include <bits/types/struct___pthread_cond.h> typedef struct __pthread_cond pthread_cond_t; #ifdef __USE_XOPEN2K diff --git a/sysdeps/pthread/bits/condition.h b/sysdeps/pthread/bits/types/struct___pthread_cond.h index 75942e2..11c685e 100644 --- a/sysdeps/pthread/bits/condition.h +++ b/sysdeps/pthread/bits/types/struct___pthread_cond.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_CONDITION_H -#define _BITS_CONDITION_H 1 +#ifndef _BITS_TYPES_STRUCT___PTHREAD_COND_H +#define _BITS_TYPES_STRUCT___PTHREAD_COND_H 1 #include <bits/types/__pthread_spinlock_t.h> @@ -35,4 +35,4 @@ struct __pthread_cond #define __PTHREAD_COND_INITIALIZER \ { __PTHREAD_SPIN_LOCK_INITIALIZER, NULL, NULL, NULL, NULL } -#endif /* bits/condition.h */ +#endif /* bits/types/struct___pthread_cond.h */ |