am 02f96b9d: Merge "Add missing extern "C"."

* commit '02f96b9db0242711fe1dfe0713c0c4e698561da5':
  Add missing extern "C".
This commit is contained in:
Elliott Hughes
2013-01-22 11:32:16 -08:00
committed by Android Git Automerger

View File

@@ -272,8 +272,8 @@ static void mutex_unlock_checked(MutexInfo* object);
/****************************************************************************/ /****************************************************************************/
extern int pthread_mutex_lock_impl(pthread_mutex_t *mutex); extern "C" int pthread_mutex_lock_impl(pthread_mutex_t *mutex);
extern int pthread_mutex_unlock_impl(pthread_mutex_t *mutex); extern "C" int pthread_mutex_unlock_impl(pthread_mutex_t *mutex);
static int pthread_mutex_lock_unchecked(pthread_mutex_t *mutex) { static int pthread_mutex_lock_unchecked(pthread_mutex_t *mutex) {
return pthread_mutex_lock_impl(mutex); return pthread_mutex_lock_impl(mutex);