From 2b028f5ce47b8d27ca6d3b86e135f7d9b0359547 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Tue, 23 Jun 2015 09:14:16 -0700 Subject: [PATCH] Fix bad merge of 64e9e71cdb7d88397e510e1986d494b797ed3b45. Bug: http://b/22029751 Change-Id: I6245fe5f274c9af8a632da5eebe50cf9fe29dc4a --- libc/include/pthread.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/libc/include/pthread.h b/libc/include/pthread.h index 6fb06fbbd..260ae5b87 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,