diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-03-19 02:16:26 +0100 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-03-19 02:17:13 +0100 |
| commit | faa970ad2f949a2ec70971337c4aba7f9fe736f7 (patch) | |
| tree | c20045c3aae0eef98d04a0aaf0f41f3e273aa049 | |
| parent | c09b93588c95ec9bc843da570a7a840dab27a4fc (diff) | |
Move bits/barrier.h to bits/types/struct___pthread_barrier.h
* sysdeps/pthread/bits/barrier.h: Move file to...
* sysdeps/pthread/bits/types/struct___pthread_barrier.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_barrier.h (renamed from sysdeps/pthread/bits/barrier.h) | 6 |
4 files changed, 6 insertions, 6 deletions
@@ -156,7 +156,7 @@ headers := \ bits/cancelation.h \ bits/thread-attr.h \ bits/types/struct___pthread_barrierattr.h \ - bits/barrier.h \ + bits/types/struct___pthread_barrier.h \ bits/thread-specific.h \ bits/once.h \ bits/mutex-attr.h \ diff --git a/sysdeps/generic/pthread.h b/sysdeps/generic/pthread.h index 00a947e..ec7b50f 100644 --- a/sysdeps/generic/pthread.h +++ b/sysdeps/generic/pthread.h @@ -750,7 +750,7 @@ extern int pthread_barrierattr_setpshared (pthread_barrierattr_t *__attr, /* Barriers. */ -#include <bits/barrier.h> +#include <bits/types/struct___pthread_barrier.h> /* Returned by pthread_barrier_wait to exactly one thread each time a barrier is passed. */ diff --git a/sysdeps/pthread/bits/pthreadtypes.h b/sysdeps/pthread/bits/pthreadtypes.h index 4516a17..c34e2d9 100644 --- a/sysdeps/pthread/bits/pthreadtypes.h +++ b/sysdeps/pthread/bits/pthreadtypes.h @@ -117,7 +117,7 @@ typedef struct __pthread_rwlock pthread_rwlock_t; #include <bits/types/struct___pthread_barrierattr.h> typedef struct __pthread_barrierattr pthread_barrierattr_t; -#include <bits/barrier.h> +#include <bits/types/struct___pthread_barrier.h> typedef struct __pthread_barrier pthread_barrier_t; #endif /* __USE_XOPEN2K */ diff --git a/sysdeps/pthread/bits/barrier.h b/sysdeps/pthread/bits/types/struct___pthread_barrier.h index 2ea8c15..a4c0f61 100644 --- a/sysdeps/pthread/bits/barrier.h +++ b/sysdeps/pthread/bits/types/struct___pthread_barrier.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_H -#define _BITS_BARRIER_H 1 +#ifndef _BITS_TYPES_STRUCT___PTHREAD_BARRIER_H +#define _BITS_TYPES_STRUCT___PTHREAD_BARRIER_H 1 #include <bits/types/__pthread_spinlock_t.h> @@ -35,4 +35,4 @@ struct __pthread_barrier }; -#endif /* bits/barrier.h */ +#endif /* bits/types/struct___pthread_barrier.h */ |