generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am e9859df7: am 973bf681: am 77039d34: am e8f81547: Merge "Fix build warning of initialization but no use."

Browse Source 
* commit 'e9859df7cc57f761a4b9457b4d55ecff33bfdc8b':
  Fix build warning of initialization but no use.
This commit is contained in:
Ian Rogers 2012-09-06 11:54:48 -07:00 committed by Android Git Automerger
commit 593315c327
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libc/upstream-dlmalloc/malloc.c
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;
} }