diff options
| author | Nick Kralevich <nnk@google.com> | 2015-04-08 22:50:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-04-08 22:50:03 +0000 |
| commit | 6d08a0d3fc108f80db47541b0ecbb89e99a99260 (patch) | |
| tree | 337454597a20d9c26a8278eaa756e2201d28c18e | |
| parent | f5b9830bc94d1416001fda508c7ecf16db5db27c (diff) | |
| parent | 9b44afb4529d743e291d6565d6fbe463cd8c964b (diff) | |
| download | build-6d08a0d3fc108f80db47541b0ecbb89e99a99260.zip build-6d08a0d3fc108f80db47541b0ecbb89e99a99260.tar.gz build-6d08a0d3fc108f80db47541b0ecbb89e99a99260.tar.bz2 | |
Merge "AndroidConfig.h: ensure HAVE_MALLOC_H always has a value."
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 2673640..c28a7f8 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 <malloc.h> 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 5f107bf..e819535 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 <malloc.h> 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 baa59fd..cee484d 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 <malloc.h> 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 999dfe6..a5dcef1 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 <malloc.h> 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 c85dbec..62d569e 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 <malloc.h> 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 ab77f6b..89b29fe 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 <malloc.h> 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 afa1bc6..41e4df9 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 <malloc.h> header */ -#define HAVE_MALLOC_H +#define HAVE_MALLOC_H 1 /* * Define if we're running on *our* linux on device or emulator. |