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

* commit 'ac14f9710b0c6405c19d2eff6f435c51dea1e4f5':
  AndroidConfig.h: ensure HAVE_MALLOC_H always has a value.
This commit is contained in:
Nick Kralevich 2015-04-09 01:13:07 +00:00 committed by Android Git Automerger
commit 8d36507971
7 changed files with 7 additions and 7 deletions

View file

@ -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

View file

@ -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.

View file

@ -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.

View file

@ -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.

View file

@ -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.

View file

@ -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

View file

@ -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.