From 09f76cdd9bba385b1eab4ffd6abd1aed96dce93d Mon Sep 17 00:00:00 2001 From: Ian Rogers Date: Thu, 6 Sep 2012 09:55:36 -0700 Subject: [PATCH] Fix build warning of initialization but no use. first_run is only used with LOCK_AT_FORK, however, care needs to be taken with the #if to avoid compiler warnings when LOCK_AT_FORK isn't being used. Change-Id: I6bcfac2ab8732c91607f4a1bcd7c0019f29c2eec --- libc/upstream-dlmalloc/malloc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libc/upstream-dlmalloc/malloc.c b/libc/upstream-dlmalloc/malloc.c index d951841ee..3ef9b61a6 100644 --- a/libc/upstream-dlmalloc/malloc.c +++ b/libc/upstream-dlmalloc/malloc.c @@ -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; }