StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 4dc8e856: Merge "remove __linux__ in AndroidConfig.h"

Browse Source 
* commit '4dc8e8561fa807fb6417f1405f4364a1bf6d4060':
  remove __linux__ in AndroidConfig.h
This commit is contained in:
Yabin Cui
2014-11-11 17:40:51 +00:00
committed by Android Git Automerger
parent 089d75728a 4dc8e8561f
commit 899b18775b
5 changed files with 2 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/combo/include/arch/linux-arm/AndroidConfig.h
View File

@@ -93,19 +93,12 @@
#define HAVE_ENDIAN_H #define HAVE_ENDIAN_H
#define HAVE_LITTLE_ENDIAN #define HAVE_LITTLE_ENDIAN
/*
* Add any extra platform-specific defines here.
*/
#ifndef __linux__
#define __linux__
#endif
/* /*
* Define if we have <malloc.h> header * Define if we have <malloc.h> header
*/ */
#define HAVE_MALLOC_H #define HAVE_MALLOC_H
/* /*
* Define if we're running on *our* linux on device or emulator. * Define if we're running on *our* linux on device or emulator.
*/ */
#define HAVE_ANDROID_OS 1 #define HAVE_ANDROID_OS 1

7
core/combo/include/arch/linux-arm64/AndroidConfig.h
View File

@@ -91,13 +91,6 @@
#define _FILE_OFFSET_BITS 64 #define _FILE_OFFSET_BITS 64
/* #define _LARGEFILE_SOURCE 1 */ /* #define _LARGEFILE_SOURCE 1 */
/*
* Add any extra platform-specific defines here.
*/
#ifndef __linux__
#define __linux__
#endif
/* /*
* Define if we have <malloc.h> header * Define if we have <malloc.h> header
*/ */

19
core/combo/include/arch/linux-mips/AndroidConfig.h
View File

@@ -121,25 +121,6 @@
/* #define _FILE_OFFSET_BITS 64 */ /* #define _FILE_OFFSET_BITS 64 */
/* #define _LARGEFILE_SOURCE 1 */ /* #define _LARGEFILE_SOURCE 1 */
/*
* Add any extra platform-specific defines here.
*/
#ifndef __linux__
#define __linux__ 1
#endif
#ifndef __linux
#define __linux 1
#endif
#ifdef __unix__
#undef __unix__
#endif
#ifdef __unix
#undef __unix
#endif
/* /*
* Define if we have <malloc.h> header * Define if we have <malloc.h> header
*/ */

19
core/combo/include/arch/linux-mips64/AndroidConfig.h
View File

@@ -111,25 +111,6 @@
#define _FILE_OFFSET_BITS 64 #define _FILE_OFFSET_BITS 64
/* #define _LARGEFILE_SOURCE 1 */ /* #define _LARGEFILE_SOURCE 1 */
/*
* Add any extra platform-specific defines here.
*/
#ifndef __linux__
#define __linux__ 1
#endif
#ifndef __linux
#define __linux 1
#endif
#ifdef __unix__
#undef __unix__
#endif
#ifdef __unix
#undef __unix
#endif
/* /*
* Define if we have <malloc.h> header * Define if we have <malloc.h> header
*/ */

9
core/combo/include/arch/target_linux-x86/AndroidConfig.h
View File

@@ -85,19 +85,12 @@
#endif #endif
/* #define _LARGEFILE_SOURCE 1 */ /* #define _LARGEFILE_SOURCE 1 */
/*
* Add any extra platform-specific defines here.
*/
#ifndef __linux__
#define __linux__
#endif
/* /*
* Define if we have <malloc.h> header * Define if we have <malloc.h> header
*/ */
#define HAVE_MALLOC_H #define HAVE_MALLOC_H
/* /*
* Define if we're running on *our* linux on device or emulator. * Define if we're running on *our* linux on device or emulator.
*/ */
#define HAVE_ANDROID_OS 1 #define HAVE_ANDROID_OS 1