From 23deccd65c65f8e695bdf88321bcb7ee9a0d475d Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Mon, 19 Mar 2018 01:59:16 +0100 Subject: Move bits/spin-lock.h to bits/types/__pthread_spinlock_t.h * sysdeps/mach/bits/spin-lock.h: Move file to... * sysdeps/mach/bits/types/__pthread_spinlock_t.h: ... here. * Makefile (headers): Move bits/spin-lock.h to bits/types/__pthread_spinlock_t.h. * pthread/pt-spin-inlines.c: Update accordingly. * sysdeps/generic/pthread.h: Likewise. * sysdeps/mach/bits/spin-lock-inline.h: Likewise. * sysdeps/pthread/bits/barrier.h: Likewise. * sysdeps/pthread/bits/condition.h: Likewise. * sysdeps/pthread/bits/mutex.h: Likewise. * sysdeps/pthread/bits/once.h: Likewise. * sysdeps/pthread/bits/pthreadtypes.h: Likewise. * sysdeps/pthread/bits/rwlock.h: Likewise. * sysdeps/pthread/bits/semaphore.h: Likewise. --- sysdeps/generic/pthread.h | 2 +- sysdeps/mach/bits/spin-lock-inline.h | 4 +-- sysdeps/mach/bits/spin-lock.h | 34 -------------------------- sysdeps/mach/bits/types/__pthread_spinlock_t.h | 34 ++++++++++++++++++++++++++ sysdeps/pthread/bits/barrier.h | 2 +- sysdeps/pthread/bits/condition.h | 2 +- sysdeps/pthread/bits/mutex.h | 2 +- sysdeps/pthread/bits/once.h | 2 +- sysdeps/pthread/bits/pthreadtypes.h | 2 +- sysdeps/pthread/bits/rwlock.h | 2 +- sysdeps/pthread/bits/semaphore.h | 2 +- 11 files changed, 44 insertions(+), 44 deletions(-) delete mode 100644 sysdeps/mach/bits/spin-lock.h create mode 100644 sysdeps/mach/bits/types/__pthread_spinlock_t.h (limited to 'sysdeps') diff --git a/sysdeps/generic/pthread.h b/sysdeps/generic/pthread.h index d2e73c2..cded1ca 100644 --- a/sysdeps/generic/pthread.h +++ b/sysdeps/generic/pthread.h @@ -521,7 +521,7 @@ extern int pthread_cond_timedwait (pthread_cond_t *__restrict __cond, #ifdef __USE_XOPEN2K -# include +# include #define PTHREAD_SPINLOCK_INITIALIZER __PTHREAD_SPIN_LOCK_INITIALIZER diff --git a/sysdeps/mach/bits/spin-lock-inline.h b/sysdeps/mach/bits/spin-lock-inline.h index c1c599c..695c6dc 100644 --- a/sysdeps/mach/bits/spin-lock-inline.h +++ b/sysdeps/mach/bits/spin-lock-inline.h @@ -20,7 +20,7 @@ #define _BITS_SPIN_LOCK_INLINE_H 1 #include -#include +#include #include /* This does all the work. */ __BEGIN_DECLS @@ -84,4 +84,4 @@ __pthread_spin_unlock (__pthread_spinlock_t *__lock) __END_DECLS -#endif /* bits/spin-lock.h */ +#endif /* bits/types/__pthread_spinlock_t.h */ diff --git a/sysdeps/mach/bits/spin-lock.h b/sysdeps/mach/bits/spin-lock.h deleted file mode 100644 index ef210fc..0000000 --- a/sysdeps/mach/bits/spin-lock.h +++ /dev/null @@ -1,34 +0,0 @@ -/* Definitions of user-visible names for spin locks. - Copyright (C) 1994-2018 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, see - . */ - -#ifndef _BITS_SPIN_LOCK_H -#define _BITS_SPIN_LOCK_H 1 - -#include - -__BEGIN_DECLS - -/* The type of a spin lock object. */ -typedef volatile int __pthread_spinlock_t; - -/* Initializer for a spin lock object. */ -#define __PTHREAD_SPIN_LOCK_INITIALIZER 0 - -__END_DECLS - -#endif /* bits/spin-lock.h */ diff --git a/sysdeps/mach/bits/types/__pthread_spinlock_t.h b/sysdeps/mach/bits/types/__pthread_spinlock_t.h new file mode 100644 index 0000000..038e2b4 --- /dev/null +++ b/sysdeps/mach/bits/types/__pthread_spinlock_t.h @@ -0,0 +1,34 @@ +/* Definitions of user-visible names for spin locks. + Copyright (C) 1994-2018 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#ifndef _BITS_TYPES___PTHREAD_SPINLOCK_T_H +#define _BITS_TYPES___PTHREAD_SPINLOCK_T_H 1 + +#include + +__BEGIN_DECLS + +/* The type of a spin lock object. */ +typedef volatile int __pthread_spinlock_t; + +/* Initializer for a spin lock object. */ +#define __PTHREAD_SPIN_LOCK_INITIALIZER 0 + +__END_DECLS + +#endif /* bits/types/__pthread_spinlock_t.h */ diff --git a/sysdeps/pthread/bits/barrier.h b/sysdeps/pthread/bits/barrier.h index 52b35c0..2ea8c15 100644 --- a/sysdeps/pthread/bits/barrier.h +++ b/sysdeps/pthread/bits/barrier.h @@ -19,7 +19,7 @@ #ifndef _BITS_BARRIER_H #define _BITS_BARRIER_H 1 -#include +#include /* This structure describes the attributes of a POSIX barrier. */ struct __pthread_barrier diff --git a/sysdeps/pthread/bits/condition.h b/sysdeps/pthread/bits/condition.h index 7e59ae6..75942e2 100644 --- a/sysdeps/pthread/bits/condition.h +++ b/sysdeps/pthread/bits/condition.h @@ -19,7 +19,7 @@ #ifndef _BITS_CONDITION_H #define _BITS_CONDITION_H 1 -#include +#include /* User visible part of a condition variable. */ struct __pthread_cond diff --git a/sysdeps/pthread/bits/mutex.h b/sysdeps/pthread/bits/mutex.h index 0a88348..bd1ad8f 100644 --- a/sysdeps/pthread/bits/mutex.h +++ b/sysdeps/pthread/bits/mutex.h @@ -21,7 +21,7 @@ #ifndef _BITS_MUTEX_H #define _BITS_MUTEX_H 1 -#include +#include #include /* User visible part of a mutex. */ diff --git a/sysdeps/pthread/bits/once.h b/sysdeps/pthread/bits/once.h index 4ba68ab..610a269 100644 --- a/sysdeps/pthread/bits/once.h +++ b/sysdeps/pthread/bits/once.h @@ -19,7 +19,7 @@ #ifndef _BITS_ONCE_H #define _BITS_ONCE_H 1 -#include +#include struct __pthread_once { diff --git a/sysdeps/pthread/bits/pthreadtypes.h b/sysdeps/pthread/bits/pthreadtypes.h index 8853e1e..574ec63 100644 --- a/sysdeps/pthread/bits/pthreadtypes.h +++ b/sysdeps/pthread/bits/pthreadtypes.h @@ -98,7 +98,7 @@ typedef struct __pthread_condattr pthread_condattr_t; typedef struct __pthread_cond pthread_cond_t; #ifdef __USE_XOPEN2K -# include +# include typedef __pthread_spinlock_t pthread_spinlock_t; #endif /* XPG6. */ diff --git a/sysdeps/pthread/bits/rwlock.h b/sysdeps/pthread/bits/rwlock.h index df18503..8fee357 100644 --- a/sysdeps/pthread/bits/rwlock.h +++ b/sysdeps/pthread/bits/rwlock.h @@ -19,7 +19,7 @@ #ifndef _BITS_RWLOCK_H #define _BITS_RWLOCK_H -#include +#include /* User visible part of a rwlock. If __held is not held and readers is 0, then the lock is unlocked. If __held is held and readers is diff --git a/sysdeps/pthread/bits/semaphore.h b/sysdeps/pthread/bits/semaphore.h index 1b20f75..6913766 100644 --- a/sysdeps/pthread/bits/semaphore.h +++ b/sysdeps/pthread/bits/semaphore.h @@ -23,7 +23,7 @@ #error Never include directly. #endif -#include +#include #include /* User visible part of a semaphore. */ -- cgit v1.2.3