am e8f81547: Merge "Fix build warning of initialization but no use."

* commit 'e8f815473ba463b875cea757bc0a52fc32f10748':
  Fix build warning of initialization but no use.
This commit is contained in:
Ian Rogers 2012-09-06 11:45:54 -07:00 committed by Android Git Automerger
commit 77039d3444

View file

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