From 0faa78e6e03f8ee2abe4ed2838a3e86b4cf60876 Mon Sep 17 00:00:00 2001 From: Andrew Hsieh Date: Mon, 24 Feb 2014 13:08:12 +0800 Subject: [PATCH] Define __PTHREAD_*_INIT_VLAUE in pthread.h for API < 9 Define __PTHREAD_MUTEX_INIT_VALUE, __PTHREAD_RECURSIVE_MUTEX_INIT_VALUE, and __PTHREAD_ERRORCHECK_MUTEX_INIT_VALUE in pthread.h for API < 9. Pthread.h in API >= 9 have those already since bionic 9831ad3ce6bd5b22da16a275ed67e7236eae3d1f Change-Id: Ia97960ecbfed0811dde70f75cb23951ecdf803af --- ndk/platforms/android-3/include/pthread.h | 10 +++++++--- ndk/platforms/android-5/include/pthread.h | 10 +++++++--- ndk/platforms/android-8/include/pthread.h | 10 +++++++--- 3 files changed, 21 insertions(+), 9 deletions(-) diff --git a/ndk/platforms/android-3/include/pthread.h b/ndk/platforms/android-3/include/pthread.h index 63ddb76bd..ef546e19e 100644 --- a/ndk/platforms/android-3/include/pthread.h +++ b/ndk/platforms/android-3/include/pthread.h @@ -42,9 +42,13 @@ typedef struct int volatile value; } pthread_mutex_t; -#define PTHREAD_MUTEX_INITIALIZER {0} -#define PTHREAD_RECURSIVE_MUTEX_INITIALIZER {0x4000} -#define PTHREAD_ERRORCHECK_MUTEX_INITIALIZER {0x8000} +#define __PTHREAD_MUTEX_INIT_VALUE 0 +#define __PTHREAD_RECURSIVE_MUTEX_INIT_VALUE 0x4000 +#define __PTHREAD_ERRORCHECK_MUTEX_INIT_VALUE 0x8000 + +#define PTHREAD_MUTEX_INITIALIZER {__PTHREAD_MUTEX_INIT_VALUE} +#define PTHREAD_RECURSIVE_MUTEX_INITIALIZER {__PTHREAD_RECURSIVE_MUTEX_INIT_VALUE} +#define PTHREAD_ERRORCHECK_MUTEX_INITIALIZER {__PTHREAD_ERRORCHECK_MUTEX_INIT_VALUE} enum { PTHREAD_MUTEX_NORMAL = 0, diff --git a/ndk/platforms/android-5/include/pthread.h b/ndk/platforms/android-5/include/pthread.h index b3e0f9f74..0250736fc 100644 --- a/ndk/platforms/android-5/include/pthread.h +++ b/ndk/platforms/android-5/include/pthread.h @@ -42,9 +42,13 @@ typedef struct int volatile value; } pthread_mutex_t; -#define PTHREAD_MUTEX_INITIALIZER {0} -#define PTHREAD_RECURSIVE_MUTEX_INITIALIZER {0x4000} -#define PTHREAD_ERRORCHECK_MUTEX_INITIALIZER {0x8000} +#define __PTHREAD_MUTEX_INIT_VALUE 0 +#define __PTHREAD_RECURSIVE_MUTEX_INIT_VALUE 0x4000 +#define __PTHREAD_ERRORCHECK_MUTEX_INIT_VALUE 0x8000 + +#define PTHREAD_MUTEX_INITIALIZER {__PTHREAD_MUTEX_INIT_VALUE} +#define PTHREAD_RECURSIVE_MUTEX_INITIALIZER {__PTHREAD_RECURSIVE_MUTEX_INIT_VALUE} +#define PTHREAD_ERRORCHECK_MUTEX_INITIALIZER {__PTHREAD_ERRORCHECK_MUTEX_INIT_VALUE} enum { PTHREAD_MUTEX_NORMAL = 0, diff --git a/ndk/platforms/android-8/include/pthread.h b/ndk/platforms/android-8/include/pthread.h index 7de36349e..ea51cf43d 100644 --- a/ndk/platforms/android-8/include/pthread.h +++ b/ndk/platforms/android-8/include/pthread.h @@ -42,9 +42,13 @@ typedef struct int volatile value; } pthread_mutex_t; -#define PTHREAD_MUTEX_INITIALIZER {0} -#define PTHREAD_RECURSIVE_MUTEX_INITIALIZER {0x4000} -#define PTHREAD_ERRORCHECK_MUTEX_INITIALIZER {0x8000} +#define __PTHREAD_MUTEX_INIT_VALUE 0 +#define __PTHREAD_RECURSIVE_MUTEX_INIT_VALUE 0x4000 +#define __PTHREAD_ERRORCHECK_MUTEX_INIT_VALUE 0x8000 + +#define PTHREAD_MUTEX_INITIALIZER {__PTHREAD_MUTEX_INIT_VALUE} +#define PTHREAD_RECURSIVE_MUTEX_INITIALIZER {__PTHREAD_RECURSIVE_MUTEX_INIT_VALUE} +#define PTHREAD_ERRORCHECK_MUTEX_INITIALIZER {__PTHREAD_ERRORCHECK_MUTEX_INIT_VALUE} enum { PTHREAD_MUTEX_NORMAL = 0,