From: DJ Delorie <dj@delorie.com>
Date: Tue, 31 Jan 2017 01:10:18 +0000 (-0500)
Subject: Fix tunables conditionals
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8fc36e8a22e61051641f5c7f979f1f9fb07a5a8d;p=thirdparty%2Fglibc.git

Fix tunables conditionals

- Fix ifdef -> if
- Conditionalize tunables hooks
---

diff --git a/malloc/arena.c b/malloc/arena.c
index 74616df110e..d115d351b36 100644
--- a/malloc/arena.c
+++ b/malloc/arena.c
@@ -236,9 +236,11 @@ DL_TUNABLE_CALLBACK_FNDECL (set_perturb_byte, int32_t)
 DL_TUNABLE_CALLBACK_FNDECL (set_trim_threshold, size_t)
 DL_TUNABLE_CALLBACK_FNDECL (set_arena_max, size_t)
 DL_TUNABLE_CALLBACK_FNDECL (set_arena_test, size_t)
+#if USE_TCACHE
 DL_TUNABLE_CALLBACK_FNDECL (set_tcache_max, size_t)
 DL_TUNABLE_CALLBACK_FNDECL (set_tcache_count, size_t)
 DL_TUNABLE_CALLBACK_FNDECL (set_tcache_unsorted_limit, size_t)
+#endif
 #else
 /* Initialization routine. */
 #include <string.h>
diff --git a/malloc/malloc.c b/malloc/malloc.c
index 5b61f75c4bc..d19fa03a1a2 100644
--- a/malloc/malloc.c
+++ b/malloc/malloc.c
@@ -5083,7 +5083,7 @@ do_set_arena_max (size_t value)
   return 1;
 }
 
-#ifdef USE_TCACHE
+#if USE_TCACHE
 static inline int
 __always_inline
 do_set_tcache_max (size_t value)