Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8d365079 authored by Nick Kralevich's avatar Nick Kralevich Committed by Android Git Automerger
Browse files

am ac14f971: am 801411da: am 6d08a0d3: Merge "AndroidConfig.h: ensure... 

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

* commit 'ac14f971':
  AndroidConfig.h: ensure HAVE_MALLOC_H always has a value.
parents d9509e97 ac14f971

core/combo/include/arch/darwin-x86/AndroidConfig.h

+1 −1
Original line number Diff line number Diff line
@@ -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

core/combo/include/arch/linux-arm/AndroidConfig.h

+1 −1
Original line number Diff line number Diff line
@@ -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.

core/combo/include/arch/linux-arm64/AndroidConfig.h

+1 −1
Original line number Diff line number Diff line
@@ -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.

core/combo/include/arch/linux-mips/AndroidConfig.h

+1 −1
Original line number Diff line number Diff line
@@ -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.

core/combo/include/arch/linux-mips64/AndroidConfig.h

+1 −1
Original line number Diff line number Diff line
@@ -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.