Merge "Fix build warning of initialization but no use."

This commit is contained in:
Ian Rogers
2012-09-06 11:41:52 -07:00
committed by android code review

View File

@@ -3193,11 +3193,11 @@ static int init_mparams(void) {
RELEASE_MALLOC_GLOBAL_LOCK(); RELEASE_MALLOC_GLOBAL_LOCK();
/* BEGIN android-added: move pthread_atfork outside of lock */ /* BEGIN android-added: move pthread_atfork outside of lock */
#if LOCK_AT_FORK
if (first_run != 0) { if (first_run != 0) {
#if LOCK_AT_FORK
pthread_atfork(&pre_fork, &post_fork_parent, &post_fork_child); pthread_atfork(&pre_fork, &post_fork_parent, &post_fork_child);
}
#endif #endif
}
/* END android-added */ /* END android-added */
return 1; return 1;
} }