diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2015-02-14 23:04:02 -0600 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2015-02-14 23:04:02 -0600 |
| commit | e1e46622ac0fce73d802fa4a8a2e83cc25cd9e7a (patch) | |
| tree | 2c8d14e4dcc733f4227f0984ed05da5826b13acd /libpthread/linuxthreads/spinlock.h | |
| parent | 6b6ede3d15f04fe825cfa9f697507457e3640344 (diff) | |
Revert "resolve merge"
This reverts commit 6b6ede3d15f04fe825cfa9f697507457e3640344.
Diffstat (limited to 'libpthread/linuxthreads/spinlock.h')
| -rw-r--r-- | libpthread/linuxthreads/spinlock.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libpthread/linuxthreads/spinlock.h b/libpthread/linuxthreads/spinlock.h index 7117898f7..2a3c2277f 100644 --- a/libpthread/linuxthreads/spinlock.h +++ b/libpthread/linuxthreads/spinlock.h @@ -172,7 +172,8 @@ static __inline__ int __pthread_alt_trylock (struct _pthread_fastlock * lock) /* Operations on pthread_atomic, which is defined in internals.h */ -static __inline__ long atomic_increment(struct pthread_atomic *pa) +static __inline__ long +pthread_atomic_increment (struct pthread_atomic *pa) { long oldval; @@ -184,7 +185,8 @@ static __inline__ long atomic_increment(struct pthread_atomic *pa) } -static __inline__ long atomic_decrement(struct pthread_atomic *pa) +static __inline__ long +pthread_atomic_decrement (struct pthread_atomic *pa) { long oldval; @@ -196,7 +198,7 @@ static __inline__ long atomic_decrement(struct pthread_atomic *pa) } -static __inline__ void +static __inline__ __attribute__((always_inline)) void __pthread_set_own_extricate_if (pthread_descr self, pthread_extricate_if *peif) { /* Only store a non-null peif if the thread has cancellation enabled. |