am 6d08a0d3: Merge "AndroidConfig.h: ensure HAVE_MALLOC_H always has a value."

* commit '6d08a0d3fc108f80db47541b0ecbb89e99a99260':
  AndroidConfig.h: ensure HAVE_MALLOC_H always has a value.
This commit is contained in:
Nick Kralevich
2015-04-08 23:27:14 +00:00
committed by Android Git Automerger
7 changed files with 7 additions and 7 deletions

View File

@@ -35,7 +35,7 @@
/* /*
* Define if we have <malloc.h> header * Define if we have <malloc.h> header
*/ */
/* #define HAVE_MALLOC_H */ /* #define HAVE_MALLOC_H 1 */
/* /*
* The default path separator for the platform * The default path separator for the platform

View File

@@ -35,7 +35,7 @@
/* /*
* Define if we have <malloc.h> header * 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. * Define if we're running on *our* linux on device or emulator.

View File

@@ -35,7 +35,7 @@
/* /*
* Define if we have <malloc.h> header * 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. * Define if we're running on *our* linux on device or emulator.

View File

@@ -35,7 +35,7 @@
/* /*
* Define if we have <malloc.h> header * 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. * Define if we're running on *our* linux on device or emulator.

View File

@@ -35,7 +35,7 @@
/* /*
* Define if we have <malloc.h> header * 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. * Define if we're running on *our* linux on device or emulator.

View File

@@ -43,7 +43,7 @@
/* /*
* Define if we have <malloc.h> header * Define if we have <malloc.h> header
*/ */
#define HAVE_MALLOC_H #define HAVE_MALLOC_H 1
/* /*
* The default path separator for the platform * The default path separator for the platform

View File

@@ -21,7 +21,7 @@
/* /*
* Define if we have <malloc.h> header * 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. * Define if we're running on *our* linux on device or emulator.