am 04afcd25: am 8ef83bc4: am 02f96b9d: Merge "Add missing extern "C"."

* commit '04afcd25a3758090009d3261f4c573b8ed73e03a':
  Add missing extern "C".
This commit is contained in:
Elliott Hughes 2013-01-22 11:35:50 -08:00 committed by Android Git Automerger
commit f669fdf11e

View File

@ -272,8 +272,8 @@ static void mutex_unlock_checked(MutexInfo* object);
/****************************************************************************/
extern int pthread_mutex_lock_impl(pthread_mutex_t *mutex);
extern int pthread_mutex_unlock_impl(pthread_mutex_t *mutex);
extern "C" int pthread_mutex_lock_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) {
return pthread_mutex_lock_impl(mutex);