From 40444d81636580c80d6000856cca6078ea41f85e Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Wed, 28 Mar 2018 02:12:59 +0200 Subject: Fix coding style --- sysdeps/generic/pthread.h | 38 ++++++++++++++++++------------------- sysdeps/pthread/bits/pthreadtypes.h | 8 ++++---- sysdeps/pthread/bits/semaphore.h | 2 +- sysdeps/pthread/pthread-functions.h | 2 +- 4 files changed, 25 insertions(+), 25 deletions(-) diff --git a/sysdeps/generic/pthread.h b/sysdeps/generic/pthread.h index 13c5693..5661cb1 100644 --- a/sysdeps/generic/pthread.h +++ b/sysdeps/generic/pthread.h @@ -229,7 +229,7 @@ extern int pthread_detach (pthread_t __threadp); if they are not. */ extern int pthread_equal (pthread_t __t1, pthread_t __t2); -# ifdef __USE_EXTERN_INLINES +#ifdef __USE_EXTERN_INLINES __extern_inline int pthread_equal (pthread_t __t1, pthread_t __t2) @@ -237,7 +237,7 @@ pthread_equal (pthread_t __t1, pthread_t __t2) return __pthread_equal (__t1, __t2); } -# endif /* Use extern inlines. */ +#endif /* Use extern inlines. */ /* Return the thread ID of the calling thread. */ @@ -250,28 +250,28 @@ extern pthread_t pthread_self (void) __THROW; #define PTHREAD_PRIO_INHERIT_NP __PTHREAD_PRIO_INHERIT #define PTHREAD_PRIO_PROTECT_NP __PTHREAD_PRIO_PROTECT #ifdef __USE_UNIX98 -#define PTHREAD_PRIO_NONE PTHREAD_PRIO_NONE_NP -#define PTHREAD_PRIO_INHERIT PTHREAD_PRIO_INHERIT_NP -#define PTHREAD_PRIO_PROTECT PTHREAD_PRIO_PROTECT_NP +# define PTHREAD_PRIO_NONE PTHREAD_PRIO_NONE_NP +# define PTHREAD_PRIO_INHERIT PTHREAD_PRIO_INHERIT_NP +# define PTHREAD_PRIO_PROTECT PTHREAD_PRIO_PROTECT_NP #endif #define PTHREAD_MUTEX_TIMED_NP __PTHREAD_MUTEX_TIMED #define PTHREAD_MUTEX_ERRORCHECK_NP __PTHREAD_MUTEX_ERRORCHECK #define PTHREAD_MUTEX_RECURSIVE_NP __PTHREAD_MUTEX_RECURSIVE #if defined __USE_UNIX98 || defined __USE_XOPEN2K8 -#define PTHREAD_MUTEX_NORMAL PTHREAD_MUTEX_TIMED_NP -#define PTHREAD_MUTEX_ERRORCHECK PTHREAD_MUTEX_ERRORCHECK_NP -#define PTHREAD_MUTEX_RECURSIVE PTHREAD_MUTEX_RECURSIVE_NP -#define PTHREAD_MUTEX_DEFAULT PTHREAD_MUTEX_NORMAL +# define PTHREAD_MUTEX_NORMAL PTHREAD_MUTEX_TIMED_NP +# define PTHREAD_MUTEX_ERRORCHECK PTHREAD_MUTEX_ERRORCHECK_NP +# define PTHREAD_MUTEX_RECURSIVE PTHREAD_MUTEX_RECURSIVE_NP +# define PTHREAD_MUTEX_DEFAULT PTHREAD_MUTEX_NORMAL #endif #ifdef __USE_GNU /* For compatibility. */ -#define PTHREAD_MUTEX_FAST_NP PTHREAD_MUTEX_TIMED_NP +# define PTHREAD_MUTEX_FAST_NP PTHREAD_MUTEX_TIMED_NP #endif #ifdef __USE_XOPEN2K -#define PTHREAD_MUTEX_STALLED __PTHREAD_MUTEX_STALLED -#define PTHREAD_MUTEX_ROBUST __PTHREAD_MUTEX_ROBUST +# define PTHREAD_MUTEX_STALLED __PTHREAD_MUTEX_STALLED +# define PTHREAD_MUTEX_ROBUST __PTHREAD_MUTEX_ROBUST #endif #include @@ -523,7 +523,7 @@ extern int pthread_cond_timedwait (pthread_cond_t *__restrict __cond, # include -#define PTHREAD_SPINLOCK_INITIALIZER __PTHREAD_SPIN_LOCK_INITIALIZER +# define PTHREAD_SPINLOCK_INITIALIZER __PTHREAD_SPIN_LOCK_INITIALIZER /* Destroy the spin lock object LOCK. */ extern int pthread_spin_destroy (pthread_spinlock_t *__lock) @@ -591,7 +591,7 @@ pthread_spin_unlock (pthread_spinlock_t *__lock) #if defined __USE_UNIX98 || defined __USE_XOPEN2K -#include +# include /* Initialize rwlock attribute object in *ATTR to the default values. */ @@ -628,9 +628,9 @@ extern int pthread_rwlockattr_setkind_np (pthread_rwlockattr_t *__attr, /* rwlocks. */ -#include +# include -#define PTHREAD_RWLOCK_INITIALIZER __PTHREAD_RWLOCK_INITIALIZER +# define PTHREAD_RWLOCK_INITIALIZER __PTHREAD_RWLOCK_INITIALIZER /* Create a rwlock object with attributes given by ATTR and strore the result in *RWLOCK. */ extern int pthread_rwlock_init (pthread_rwlock_t *__restrict __rwlock, @@ -723,7 +723,7 @@ extern void pthread_testcancel (void); #ifdef __USE_XOPEN2K -#include +# include /* Initialize barrier attribute object in *ATTR to the default values. */ @@ -750,11 +750,11 @@ extern int pthread_barrierattr_setpshared (pthread_barrierattr_t *__attr, /* Barriers. */ -#include +# include /* Returned by pthread_barrier_wait to exactly one thread each time a barrier is passed. */ -#define PTHREAD_BARRIER_SERIAL_THREAD -1 +# define PTHREAD_BARRIER_SERIAL_THREAD -1 /* Initialize barrier BARRIER. */ extern int pthread_barrier_init (pthread_barrier_t *__restrict __barrier, diff --git a/sysdeps/pthread/bits/pthreadtypes.h b/sysdeps/pthread/bits/pthreadtypes.h index 3d93484..2092f8f 100644 --- a/sysdeps/pthread/bits/pthreadtypes.h +++ b/sysdeps/pthread/bits/pthreadtypes.h @@ -103,20 +103,20 @@ typedef __pthread_spinlock_t pthread_spinlock_t; #if defined __USE_UNIX98 || defined __USE_XOPEN2K -#include +# include typedef struct __pthread_rwlockattr pthread_rwlockattr_t; -#include +# include typedef struct __pthread_rwlock pthread_rwlock_t; #endif /* __USE_UNIX98 || __USE_XOPEN2K */ #ifdef __USE_XOPEN2K -#include +# include typedef struct __pthread_barrierattr pthread_barrierattr_t; -#include +# include typedef struct __pthread_barrier pthread_barrier_t; #endif /* __USE_XOPEN2K */ diff --git a/sysdeps/pthread/bits/semaphore.h b/sysdeps/pthread/bits/semaphore.h index 2728235..b1789be 100644 --- a/sysdeps/pthread/bits/semaphore.h +++ b/sysdeps/pthread/bits/semaphore.h @@ -20,7 +20,7 @@ #define _BITS_SEMAPHORE_H 1 #ifndef _SEMAPHORE_H -#error Never include directly. +# error Never include directly. #endif #include diff --git a/sysdeps/pthread/pthread-functions.h b/sysdeps/pthread/pthread-functions.h index 49adbe5..b5683a6 100644 --- a/sysdeps/pthread/pthread-functions.h +++ b/sysdeps/pthread/pthread-functions.h @@ -134,7 +134,7 @@ extern int __libc_pthread_functions_init attribute_hidden; void __libc_pthread_init (const struct pthread_functions *functions); -# define PTHFCT_CALL(fct, params) \ +#define PTHFCT_CALL(fct, params) \ __libc_pthread_functions.fct params #endif /* pthread-functions.h */ -- cgit v1.2.3