summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2018-03-19 02:23:31 +0100
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2018-03-19 02:25:49 +0100
commitc2597197898e29c85dbfd5a10fb05c2428d2ac07 (patch)
treeba0148aaf73b210ed20cdfbf1c7ecce21bfb001d
parent64e55cccfcffd5a47a0dd92a910eefd477809b18 (diff)
Move bits/mutex-attr.h to bits/types/struct___pthread_mutexattr.h
* sysdeps/pthread/bits/mutex-attr.h: Move file to... * sysdeps/pthread/bits/types/struct___pthread_mutexattr.h: ... here. * Makefile (headers): Update accordingly. * sysdeps/generic/pthread.h: Likewise. * sysdeps/mach/hurd/bits/types/struct___pthread_mutex.h: Likewise. * sysdeps/pthread/bits/pthreadtypes.h: Likewise. * sysdeps/pthread/bits/types/struct___pthread_mutex.h: Likewise.
-rw-r--r--Makefile2
-rw-r--r--sysdeps/generic/pthread.h2
-rw-r--r--sysdeps/mach/hurd/bits/types/struct___pthread_mutex.h2
-rw-r--r--sysdeps/pthread/bits/pthreadtypes.h2
-rw-r--r--sysdeps/pthread/bits/types/struct___pthread_mutex.h2
-rw-r--r--sysdeps/pthread/bits/types/struct___pthread_mutexattr.h (renamed from sysdeps/pthread/bits/mutex-attr.h)6
6 files changed, 8 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index 684a612..d47900e 100644
--- a/Makefile
+++ b/Makefile
@@ -159,7 +159,7 @@ headers := \
bits/types/struct___pthread_barrier.h \
bits/thread-specific.h \
bits/once.h \
- bits/mutex-attr.h \
+ bits/types/struct___pthread_mutexattr.h \
bits/rwlock.h \
bits/rwlock-attr.h \
bits/semaphore.h
diff --git a/sysdeps/generic/pthread.h b/sysdeps/generic/pthread.h
index 9603aec..b06bf8b 100644
--- a/sysdeps/generic/pthread.h
+++ b/sysdeps/generic/pthread.h
@@ -274,7 +274,7 @@ extern pthread_t pthread_self (void) __THROW;
#define PTHREAD_MUTEX_ROBUST __PTHREAD_MUTEX_ROBUST
#endif
-#include <bits/mutex-attr.h>
+#include <bits/types/struct___pthread_mutexattr.h>
/* Initialize the mutex attribute object in *ATTR to the default
values. */
diff --git a/sysdeps/mach/hurd/bits/types/struct___pthread_mutex.h b/sysdeps/mach/hurd/bits/types/struct___pthread_mutex.h
index c6d356d..4fe87cc 100644
--- a/sysdeps/mach/hurd/bits/types/struct___pthread_mutex.h
+++ b/sysdeps/mach/hurd/bits/types/struct___pthread_mutex.h
@@ -19,7 +19,7 @@
#ifndef _BITS_TYPES_STRUCT___PTHREAD_MUTEX_H
#define _BITS_TYPES_STRUCT___PTHREAD_MUTEX_H 1
-#include <bits/mutex-attr.h>
+#include <bits/types/struct___pthread_mutexattr.h>
/* User visible part of a mutex. */
struct __pthread_mutex
diff --git a/sysdeps/pthread/bits/pthreadtypes.h b/sysdeps/pthread/bits/pthreadtypes.h
index 59ab32a..eeb4269 100644
--- a/sysdeps/pthread/bits/pthreadtypes.h
+++ b/sysdeps/pthread/bits/pthreadtypes.h
@@ -85,7 +85,7 @@ enum __pthread_mutex_robustness
__PTHREAD_MUTEX_ROBUST = 0x100
};
-#include <bits/mutex-attr.h>
+#include <bits/types/struct___pthread_mutexattr.h>
typedef struct __pthread_mutexattr pthread_mutexattr_t;
#include <bits/types/struct___pthread_mutex.h>
diff --git a/sysdeps/pthread/bits/types/struct___pthread_mutex.h b/sysdeps/pthread/bits/types/struct___pthread_mutex.h
index a9265c4..64b1c8c 100644
--- a/sysdeps/pthread/bits/types/struct___pthread_mutex.h
+++ b/sysdeps/pthread/bits/types/struct___pthread_mutex.h
@@ -22,7 +22,7 @@
#define _BITS_TYPES_STRUCT___PTHREAD_MUTEX_H 1
#include <bits/types/__pthread_spinlock_t.h>
-#include <bits/mutex-attr.h>
+#include <bits/types/struct___pthread_mutexattr.h>
/* User visible part of a mutex. */
struct __pthread_mutex
diff --git a/sysdeps/pthread/bits/mutex-attr.h b/sysdeps/pthread/bits/types/struct___pthread_mutexattr.h
index 0c3d91a..c77458a 100644
--- a/sysdeps/pthread/bits/mutex-attr.h
+++ b/sysdeps/pthread/bits/types/struct___pthread_mutexattr.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_ATTR_H
-#define _BITS_MUTEX_ATTR_H 1
+#ifndef _BITS_TYPES_STRUCT___PTHREAD_MUTEXATTR_H
+#define _BITS_TYPES_STRUCT___PTHREAD_MUTEXATTR_H 1
enum __pthread_mutex_protocol;
enum __pthread_process_shared;
@@ -37,4 +37,4 @@ struct __pthread_mutexattr
extern const struct __pthread_mutexattr __pthread_errorcheck_mutexattr;
extern const struct __pthread_mutexattr __pthread_recursive_mutexattr;
-#endif /* bits/mutex-attr.h */
+#endif /* bits/types/struct___pthread_mutexattr.h */