commit 1e185a5056f85e281f699a92114b758591ae3b92
author Christopher Ferris <cferris@google.com> Mon Jan 25 17:23:38 2016 -0800
committer Christopher Ferris <cferris@google.com> Mon Jan 25 17:27:40 2016 -0800
tree 86a88c43ee354e576535d5121d2250dc6412ccb8
parent f2b67b85f5e192812212d3176c07e195c0ffa503

Fix gcc test issues.

Change-Id: I2b26b779f5198c7c9362a452b971260a8852aa7b

libc/malloc_debug/Android.mk

diff --git a/libc/malloc_debug/Android.mk b/libc/malloc_debug/Android.mk
index 4c2c7f3..3eb0790 100644
--- a/libc/malloc_debug/Android.mk
+++ b/libc/malloc_debug/Android.mk
@@ -72,5 +72,6 @@
 LOCAL_CFLAGS := \
     -Wall \
     -Werror \
+    -Wno-error=format-zero-length \
 
 include $(BUILD_NATIVE_TEST)

libc/malloc_debug/tests/malloc_debug_unit_tests.cpp

diff --git a/libc/malloc_debug/tests/malloc_debug_unit_tests.cpp b/libc/malloc_debug/tests/malloc_debug_unit_tests.cpp
index 0e8ca68..08731c2 100644
--- a/libc/malloc_debug/tests/malloc_debug_unit_tests.cpp
+++ b/libc/malloc_debug/tests/malloc_debug_unit_tests.cpp
@@ -111,14 +111,20 @@
 };
 
 MallocDispatch MallocDebugTest::dispatch = {
-  .calloc = calloc,
-  .free = free,
-  .mallinfo = mallinfo,
-  .malloc = malloc,
-  .malloc_usable_size = malloc_usable_size,
-  .memalign = memalign,
-  .posix_memalign = posix_memalign,
-  .realloc = realloc,
+  calloc,
+  free,
+  mallinfo,
+  malloc,
+  malloc_usable_size,
+  memalign,
+  posix_memalign,
+#if defined(HAVE_DEPRECATED_MALLOC_FUNCS)
+  nullptr,
+#endif
+  realloc,
+#if defined(HAVE_DEPRECATED_MALLOC_FUNCS)
+  nullptr,
+#endif
 };
 
 void VerifyAllocCalls() {