diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-03-19 02:14:32 +0100 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-03-19 02:14:32 +0100 |
| commit | c09b93588c95ec9bc843da570a7a840dab27a4fc (patch) | |
| tree | 98453e8b11da82300779eaa52df3eabf4d0b200d | |
| parent | e900467cf8c98913d56098db688f28bbad883641 (diff) | |
Move bits/barrier-attr.h to bits/types/struct___pthread_barrierattr.h
* sysdeps/pthread/bits/barrier-attr.h: Move file to...
* sysdeps/pthread/bits/types/struct___pthread_barrierattr.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_barrierattr.h (renamed from sysdeps/pthread/bits/barrier-attr.h) | 6 |
4 files changed, 6 insertions, 6 deletions
@@ -155,7 +155,7 @@ headers := \ bits/spin-lock-inline.h \ bits/cancelation.h \ bits/thread-attr.h \ - bits/barrier-attr.h \ + bits/types/struct___pthread_barrierattr.h \ bits/barrier.h \ bits/thread-specific.h \ bits/once.h \ diff --git a/sysdeps/generic/pthread.h b/sysdeps/generic/pthread.h index 7be770e..00a947e 100644 --- a/sysdeps/generic/pthread.h +++ b/sysdeps/generic/pthread.h @@ -723,7 +723,7 @@ extern void pthread_testcancel (void); #ifdef __USE_XOPEN2K -#include <bits/barrier-attr.h> +#include <bits/types/struct___pthread_barrierattr.h> /* Initialize barrier attribute object in *ATTR to the default values. */ diff --git a/sysdeps/pthread/bits/pthreadtypes.h b/sysdeps/pthread/bits/pthreadtypes.h index fe2efc4..4516a17 100644 --- a/sysdeps/pthread/bits/pthreadtypes.h +++ b/sysdeps/pthread/bits/pthreadtypes.h @@ -114,7 +114,7 @@ typedef struct __pthread_rwlock pthread_rwlock_t; #ifdef __USE_XOPEN2K -#include <bits/barrier-attr.h> +#include <bits/types/struct___pthread_barrierattr.h> typedef struct __pthread_barrierattr pthread_barrierattr_t; #include <bits/barrier.h> diff --git a/sysdeps/pthread/bits/barrier-attr.h b/sysdeps/pthread/bits/types/struct___pthread_barrierattr.h index 7a75637..5ac2c34 100644 --- a/sysdeps/pthread/bits/barrier-attr.h +++ b/sysdeps/pthread/bits/types/struct___pthread_barrierattr.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_BARRIER_ATTR_H -#define _BITS_BARRIER_ATTR_H 1 +#ifndef _BITS_TYPES_STRUCT___PTHREAD_BARRIERATTR_H +#define _BITS_TYPES_STRUCT___PTHREAD_BARRIERATTR_H 1 enum __pthread_process_shared; @@ -28,4 +28,4 @@ struct __pthread_barrierattr enum __pthread_process_shared __pshared; }; -#endif /* bits/barrier-attr.h */ +#endif /* bits/types/struct___pthread_barrierattr.h */ |