generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 2b028f5c: Fix bad merge of 64e9e71cdb.

Browse Source 
* commit '2b028f5ce47b8d27ca6d3b86e135f7d9b0359547':
  Fix bad merge of 64e9e71cdb.
This commit is contained in:
Elliott Hughes
2015-06-23 18:08:10 +00:00
committed by Android Git Automerger
parent 3226cad538 2b028f5ce4
commit 9209b0a169
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libc/include/pthread.h
View File

@@ -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,