summaryrefslogtreecommitdiff
path: root/sysdeps
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2018-03-19 02:18:53 +0100
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2018-03-19 02:19:20 +0100
commitd94e01e61ca3fe2d8c3a0e6ab294baf68b194a14 (patch)
tree89aae050d8d4715c2615d5faee1a1d5cd2ae44e1 /sysdeps
parentfaa970ad2f949a2ec70971337c4aba7f9fe736f7 (diff)
Move bits/condition-attr.h to bits/types/struct___pthread_condattr.h
* sysdeps/pthread/bits/condition-attr.h: Move file to... * sysdeps/pthread/bits/types/struct___pthread_condattr.h: ... here. * Makefile (headers): Update accordingly. * sysdeps/generic/pthread.h: Likewise. * sysdeps/pthread/bits/pthreadtypes.h: Likewise.
Diffstat (limited to 'sysdeps')
-rw-r--r--sysdeps/generic/pthread.h2
-rw-r--r--sysdeps/pthread/bits/pthreadtypes.h2
-rw-r--r--sysdeps/pthread/bits/types/struct___pthread_condattr.h (renamed from sysdeps/pthread/bits/condition-attr.h)6
3 files changed, 5 insertions, 5 deletions
diff --git a/sysdeps/generic/pthread.h b/sysdeps/generic/pthread.h
index ec7b50f..260295f 100644
--- a/sysdeps/generic/pthread.h
+++ b/sysdeps/generic/pthread.h
@@ -440,7 +440,7 @@ extern int pthread_mutex_consistent_np (pthread_mutex_t *__mtxp)
/* Condition attributes. */
-#include <bits/condition-attr.h>
+#include <bits/types/struct___pthread_condattr.h>
/* Initialize the condition attribute in *ATTR to the default
values. */
diff --git a/sysdeps/pthread/bits/pthreadtypes.h b/sysdeps/pthread/bits/pthreadtypes.h
index c34e2d9..f874219 100644
--- a/sysdeps/pthread/bits/pthreadtypes.h
+++ b/sysdeps/pthread/bits/pthreadtypes.h
@@ -91,7 +91,7 @@ typedef struct __pthread_mutexattr pthread_mutexattr_t;
#include <bits/types/struct___pthread_mutex.h>
typedef struct __pthread_mutex pthread_mutex_t;
-#include <bits/condition-attr.h>
+#include <bits/types/struct___pthread_condattr.h>
typedef struct __pthread_condattr pthread_condattr_t;
#include <bits/condition.h>
diff --git a/sysdeps/pthread/bits/condition-attr.h b/sysdeps/pthread/bits/types/struct___pthread_condattr.h
index 0598ae1..d12c0a2 100644
--- a/sysdeps/pthread/bits/condition-attr.h
+++ b/sysdeps/pthread/bits/types/struct___pthread_condattr.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_ATTR_H
-#define _BITS_CONDITION_ATTR_H 1
+#ifndef _BITS_TYPES_STRUCT___PTHREAD_CONDATTR
+#define _BITS_TYPES_STRUCT___PTHREAD_CONDATTR 1
#include <bits/types.h>
@@ -30,4 +30,4 @@ struct __pthread_condattr
__clockid_t __clock;
};
-#endif /* bits/condition.h */
+#endif /* bits/types/struct___pthread_condattr.h */