diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-03-19 02:30:53 +0100 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-03-19 02:30:53 +0100 |
| commit | 164f0e35665764e6d0d03213c07d3998c6538567 (patch) | |
| tree | 0e1bb0e081db67503d88c3331e200873290c2a7c | |
| parent | 009612b09c555d5fea660dbb17e420d4a9533127 (diff) | |
Move bits/rwlock.h to bits/types/struct___pthread_rwlock.h
* sysdeps/pthread/bits/rwlock.h: Move file to...
* sysdeps/pthread/bits/types/struct___pthread_rwlock.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_rwlock.h (renamed from sysdeps/pthread/bits/rwlock.h) | 6 |
4 files changed, 6 insertions, 6 deletions
@@ -160,7 +160,7 @@ headers := \ bits/thread-specific.h \ bits/types/struct___pthread_once.h \ bits/types/struct___pthread_mutexattr.h \ - bits/rwlock.h \ + bits/types/struct___pthread_rwlock.h \ bits/types/struct___pthread_rwlockattr.h \ bits/semaphore.h diff --git a/sysdeps/generic/pthread.h b/sysdeps/generic/pthread.h index 56e2c43..416aed2 100644 --- a/sysdeps/generic/pthread.h +++ b/sysdeps/generic/pthread.h @@ -628,7 +628,7 @@ extern int pthread_rwlockattr_setkind_np (pthread_rwlockattr_t *__attr, /* rwlocks. */ -#include <bits/rwlock.h> +#include <bits/types/struct___pthread_rwlock.h> #define PTHREAD_RWLOCK_INITIALIZER __PTHREAD_RWLOCK_INITIALIZER /* Create a rwlock object with attributes given by ATTR and strore the diff --git a/sysdeps/pthread/bits/pthreadtypes.h b/sysdeps/pthread/bits/pthreadtypes.h index c74face..1ff4996 100644 --- a/sysdeps/pthread/bits/pthreadtypes.h +++ b/sysdeps/pthread/bits/pthreadtypes.h @@ -107,7 +107,7 @@ typedef __pthread_spinlock_t pthread_spinlock_t; #include <bits/types/struct___pthread_rwlockattr.h> typedef struct __pthread_rwlockattr pthread_rwlockattr_t; -#include <bits/rwlock.h> +#include <bits/types/struct___pthread_rwlock.h> typedef struct __pthread_rwlock pthread_rwlock_t; #endif /* __USE_UNIX98 || __USE_XOPEN2K */ diff --git a/sysdeps/pthread/bits/rwlock.h b/sysdeps/pthread/bits/types/struct___pthread_rwlock.h index 8fee357..3459e48 100644 --- a/sysdeps/pthread/bits/rwlock.h +++ b/sysdeps/pthread/bits/types/struct___pthread_rwlock.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_RWLOCK_H -#define _BITS_RWLOCK_H +#ifndef _BITS_TYPES_STRUCT___PTHREAD_RWLOCK_H +#define _BITS_TYPES_STRUCT___PTHREAD_RWLOCK_H #include <bits/types/__pthread_spinlock_t.h> @@ -42,4 +42,4 @@ struct __pthread_rwlock { __PTHREAD_SPIN_LOCK_INITIALIZER, __PTHREAD_SPIN_LOCK_INITIALIZER, 0, 0, 0, 0, 0 } -#endif /* bits/rwlock.h */ +#endif /* bits/types/struct___pthread_rwlock.h */ |