am 8ccad4af: Merge "Prepare for the removal of HAVE_MALLOC_H from AndroidConfig.h."

* commit '8ccad4af261ebfe705e9ec7f67d72410e6bc092c':
  Prepare for the removal of HAVE_MALLOC_H from AndroidConfig.h.

diff --git a/device/include/llvm/Config/config.h b/device/include/llvm/Config/config.h
index ac58972..1798b90 100644 (file)
--- a/device/include/llvm/Config/config.h
+++ b/device/include/llvm/Config/config.h
@@ -239,7 +239,7 @@
 #define HAVE_MALLINFO 1
 
 /* Define to 1 if you have the <malloc.h> header file. */
-//#define HAVE_MALLOC_H 1 /* Defined by AndroidConfig.h */
+#define HAVE_MALLOC_H 1
 
 /* Define to 1 if you have the <malloc/malloc.h> header file. */
 /* #undef HAVE_MALLOC_MALLOC_H */

diff --git a/host/include/llvm/Config/config.h b/host/include/llvm/Config/config.h
index cb3d4a3..a1978a8 100644 (file)
--- a/host/include/llvm/Config/config.h
+++ b/host/include/llvm/Config/config.h
@@ -252,7 +252,11 @@
 #endif
 
 /* Define to 1 if you have the <malloc.h> header file. */
-/* #define HAVE_MALLOC_H 1 */ /* Defined by AndroidConfig.h */
+#if !defined(__APPLE__)
+#define HAVE_MALLOC_H 1
+#else
+/* #undef HAVE_MALLOC_H */
+#endif
 
 /* Define to 1 if you have the <malloc/malloc.h> header file. */
 /* #undef HAVE_MALLOC_MALLOC_H */