diff options
| author | Elliott Hughes <enh@google.com> | 2015-06-23 09:14:16 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2015-06-23 09:14:16 -0700 |
| commit | 2b028f5ce47b8d27ca6d3b86e135f7d9b0359547 (patch) | |
| tree | f0340cfddde5600b2d547eba9338b78f25ad4df1 | |
| parent | d6d6c0c4f10c047b25b45289f5c30338cd1da239 (diff) | |
| download | bionic-2b028f5ce47b8d27ca6d3b86e135f7d9b0359547.zip bionic-2b028f5ce47b8d27ca6d3b86e135f7d9b0359547.tar.gz bionic-2b028f5ce47b8d27ca6d3b86e135f7d9b0359547.tar.bz2 | |
Fix bad merge of 64e9e71cdb7d88397e510e1986d494b797ed3b45.
Bug: http://b/22029751
Change-Id: I6245fe5f274c9af8a632da5eebe50cf9fe29dc4a
| -rw-r--r-- | libc/include/pthread.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/libc/include/pthread.h b/libc/include/pthread.h index 6fb06fb..260ae5b 100644 --- a/libc/include/pthread.h +++ b/libc/include/pthread.h @@ -46,9 +46,6 @@ typedef struct { typedef long pthread_mutexattr_t; -#define PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP PTHREAD_RECURSIVE_MUTEX_INITIALIZER -#define PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP PTHREAD_ERRORCHECK_MUTEX_INITIALIZER - enum { PTHREAD_MUTEX_NORMAL = 0, PTHREAD_MUTEX_RECURSIVE = 1, |