From 9b44afb4529d743e291d6565d6fbe463cd8c964b Mon Sep 17 00:00:00 2001 From: Nick Kralevich Date: Wed, 8 Apr 2015 12:21:54 -0700 Subject: [PATCH] AndroidConfig.h: ensure HAVE_MALLOC_H always has a value. Some programs (cough sqlite cough) do an improper check to see if HAVE_MALLOC_H is defined. Instead of defining it with no value, define it with a value so those checks pass. Needed for bug: 20099586 Change-Id: I4c293b2c1b5f4caad85ffc1fc34ac385bab23f5c --- core/combo/include/arch/darwin-x86/AndroidConfig.h | 2 +- core/combo/include/arch/linux-arm/AndroidConfig.h | 2 +- core/combo/include/arch/linux-arm64/AndroidConfig.h | 2 +- core/combo/include/arch/linux-mips/AndroidConfig.h | 2 +- core/combo/include/arch/linux-mips64/AndroidConfig.h | 2 +- core/combo/include/arch/linux-x86/AndroidConfig.h | 2 +- core/combo/include/arch/target_linux-x86/AndroidConfig.h | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/core/combo/include/arch/darwin-x86/AndroidConfig.h b/core/combo/include/arch/darwin-x86/AndroidConfig.h index 2673640de..c28a7f856 100644 --- a/core/combo/include/arch/darwin-x86/AndroidConfig.h +++ b/core/combo/include/arch/darwin-x86/AndroidConfig.h @@ -35,7 +35,7 @@ /* * Define if we have header */ -/* #define HAVE_MALLOC_H */ +/* #define HAVE_MALLOC_H 1 */ /* * The default path separator for the platform diff --git a/core/combo/include/arch/linux-arm/AndroidConfig.h b/core/combo/include/arch/linux-arm/AndroidConfig.h index 5f107bf8c..e8195352f 100644 --- a/core/combo/include/arch/linux-arm/AndroidConfig.h +++ b/core/combo/include/arch/linux-arm/AndroidConfig.h @@ -35,7 +35,7 @@ /* * Define if we have header */ -#define HAVE_MALLOC_H +#define HAVE_MALLOC_H 1 /* * Define if we're running on *our* linux on device or emulator. diff --git a/core/combo/include/arch/linux-arm64/AndroidConfig.h b/core/combo/include/arch/linux-arm64/AndroidConfig.h index baa59fd73..cee484d61 100644 --- a/core/combo/include/arch/linux-arm64/AndroidConfig.h +++ b/core/combo/include/arch/linux-arm64/AndroidConfig.h @@ -35,7 +35,7 @@ /* * Define if we have header */ -#define HAVE_MALLOC_H +#define HAVE_MALLOC_H 1 /* * Define if we're running on *our* linux on device or emulator. diff --git a/core/combo/include/arch/linux-mips/AndroidConfig.h b/core/combo/include/arch/linux-mips/AndroidConfig.h index 999dfe6d4..a5dcef185 100644 --- a/core/combo/include/arch/linux-mips/AndroidConfig.h +++ b/core/combo/include/arch/linux-mips/AndroidConfig.h @@ -35,7 +35,7 @@ /* * Define if we have header */ -#define HAVE_MALLOC_H +#define HAVE_MALLOC_H 1 /* * Define if we're running on *our* linux on device or emulator. diff --git a/core/combo/include/arch/linux-mips64/AndroidConfig.h b/core/combo/include/arch/linux-mips64/AndroidConfig.h index c85dbecdf..62d569edc 100644 --- a/core/combo/include/arch/linux-mips64/AndroidConfig.h +++ b/core/combo/include/arch/linux-mips64/AndroidConfig.h @@ -35,7 +35,7 @@ /* * Define if we have header */ -#define HAVE_MALLOC_H +#define HAVE_MALLOC_H 1 /* * Define if we're running on *our* linux on device or emulator. diff --git a/core/combo/include/arch/linux-x86/AndroidConfig.h b/core/combo/include/arch/linux-x86/AndroidConfig.h index ab77f6b54..89b29fe4e 100644 --- a/core/combo/include/arch/linux-x86/AndroidConfig.h +++ b/core/combo/include/arch/linux-x86/AndroidConfig.h @@ -43,7 +43,7 @@ /* * Define if we have header */ -#define HAVE_MALLOC_H +#define HAVE_MALLOC_H 1 /* * The default path separator for the platform diff --git a/core/combo/include/arch/target_linux-x86/AndroidConfig.h b/core/combo/include/arch/target_linux-x86/AndroidConfig.h index afa1bc695..41e4df95a 100644 --- a/core/combo/include/arch/target_linux-x86/AndroidConfig.h +++ b/core/combo/include/arch/target_linux-x86/AndroidConfig.h @@ -21,7 +21,7 @@ /* * Define if we have header */ -#define HAVE_MALLOC_H +#define HAVE_MALLOC_H 1 /* * Define if we're running on *our* linux on device or emulator.