summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2018-03-19 02:29:25 +0100
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2018-03-19 02:29:25 +0100
commit009612b09c555d5fea660dbb17e420d4a9533127 (patch)
tree16f002452b1cb24ee2e603e8ae0abd3d9896e9da
parent372a613dbe4a85779807040300985fc5289b9fd7 (diff)
Move bits/rwlock-attr.h to bits/types/struct___pthread_rwlockattr.h
* sysdeps/pthread/bits/rwlock-attr.h: Move file to... * sysdeps/pthread/bits/types/struct___pthread_rwlockattr.h: ... here. * Makefile (headers): Update accordingly. * sysdeps/generic/pthread.h: Likewise. * sysdeps/pthread/bits/pthreadtypes.h: Likewise.
-rw-r--r--Makefile2
-rw-r--r--sysdeps/generic/pthread.h2
-rw-r--r--sysdeps/pthread/bits/pthreadtypes.h2
-rw-r--r--sysdeps/pthread/bits/types/struct___pthread_rwlockattr.h (renamed from sysdeps/pthread/bits/rwlock-attr.h)6
4 files changed, 6 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index 19b5ae3..3cb628e 100644
--- a/Makefile
+++ b/Makefile
@@ -161,7 +161,7 @@ headers := \
bits/types/struct___pthread_once.h \
bits/types/struct___pthread_mutexattr.h \
bits/rwlock.h \
- bits/rwlock-attr.h \
+ bits/types/struct___pthread_rwlockattr.h \
bits/semaphore.h
distribute :=
diff --git a/sysdeps/generic/pthread.h b/sysdeps/generic/pthread.h
index d123bd2..56e2c43 100644
--- a/sysdeps/generic/pthread.h
+++ b/sysdeps/generic/pthread.h
@@ -591,7 +591,7 @@ pthread_spin_unlock (pthread_spinlock_t *__lock)
#if defined __USE_UNIX98 || defined __USE_XOPEN2K
-#include <bits/rwlock-attr.h>
+#include <bits/types/struct___pthread_rwlockattr.h>
/* Initialize rwlock attribute object in *ATTR to the default
values. */
diff --git a/sysdeps/pthread/bits/pthreadtypes.h b/sysdeps/pthread/bits/pthreadtypes.h
index 55a5659..c74face 100644
--- a/sysdeps/pthread/bits/pthreadtypes.h
+++ b/sysdeps/pthread/bits/pthreadtypes.h
@@ -104,7 +104,7 @@ typedef __pthread_spinlock_t pthread_spinlock_t;
#if defined __USE_UNIX98 || defined __USE_XOPEN2K
-#include <bits/rwlock-attr.h>
+#include <bits/types/struct___pthread_rwlockattr.h>
typedef struct __pthread_rwlockattr pthread_rwlockattr_t;
#include <bits/rwlock.h>
diff --git a/sysdeps/pthread/bits/rwlock-attr.h b/sysdeps/pthread/bits/types/struct___pthread_rwlockattr.h
index a8c33b9..7df532e 100644
--- a/sysdeps/pthread/bits/rwlock-attr.h
+++ b/sysdeps/pthread/bits/types/struct___pthread_rwlockattr.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_ATTR_H
-#define _BITS_RWLOCK_ATTR_H 1
+#ifndef _BITS_TYPES_STRUCT___PTHREAD_RWLOCKATTR_H
+#define _BITS_TYPES_STRUCT___PTHREAD_RWLOCKATTR_H 1
enum __pthread_process_shared;
@@ -28,4 +28,4 @@ struct __pthread_rwlockattr
enum __pthread_process_shared __pshared;
};
-#endif /* bits/rwlock-attr.h */
+#endif /* bits/types/struct___pthread_rwlockattr.h */