From 70af4d3796f23e6e4edbc87dc5160c6f71c49364 Mon Sep 17 00:00:00 2001 From: Yabin Cui Date: Mon, 10 Nov 2014 19:11:11 -0800 Subject: [PATCH] remove __linux__ in AndroidConfig.h Bug: 18316409 Change-Id: If6644074ec86efc2f9f91a98bf82fe26be6f66d3 --- .../include/arch/linux-arm/AndroidConfig.h | 9 +-------- .../include/arch/linux-arm64/AndroidConfig.h | 7 ------- .../include/arch/linux-mips/AndroidConfig.h | 19 ------------------- .../include/arch/linux-mips64/AndroidConfig.h | 19 ------------------- .../arch/target_linux-x86/AndroidConfig.h | 9 +-------- 5 files changed, 2 insertions(+), 61 deletions(-) diff --git a/core/combo/include/arch/linux-arm/AndroidConfig.h b/core/combo/include/arch/linux-arm/AndroidConfig.h index 544a052c23..1ca3730123 100644 --- a/core/combo/include/arch/linux-arm/AndroidConfig.h +++ b/core/combo/include/arch/linux-arm/AndroidConfig.h @@ -93,19 +93,12 @@ #define HAVE_ENDIAN_H #define HAVE_LITTLE_ENDIAN -/* - * Add any extra platform-specific defines here. - */ -#ifndef __linux__ -#define __linux__ -#endif - /* * Define if we have header */ #define HAVE_MALLOC_H -/* +/* * Define if we're running on *our* linux on device or emulator. */ #define HAVE_ANDROID_OS 1 diff --git a/core/combo/include/arch/linux-arm64/AndroidConfig.h b/core/combo/include/arch/linux-arm64/AndroidConfig.h index c8274a180f..99bf74d53a 100644 --- a/core/combo/include/arch/linux-arm64/AndroidConfig.h +++ b/core/combo/include/arch/linux-arm64/AndroidConfig.h @@ -91,13 +91,6 @@ #define _FILE_OFFSET_BITS 64 /* #define _LARGEFILE_SOURCE 1 */ -/* - * Add any extra platform-specific defines here. - */ -#ifndef __linux__ -#define __linux__ -#endif - /* * Define if we have header */ diff --git a/core/combo/include/arch/linux-mips/AndroidConfig.h b/core/combo/include/arch/linux-mips/AndroidConfig.h index 0086ac5304..da45929f58 100644 --- a/core/combo/include/arch/linux-mips/AndroidConfig.h +++ b/core/combo/include/arch/linux-mips/AndroidConfig.h @@ -121,25 +121,6 @@ /* #define _FILE_OFFSET_BITS 64 */ /* #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 header */ diff --git a/core/combo/include/arch/linux-mips64/AndroidConfig.h b/core/combo/include/arch/linux-mips64/AndroidConfig.h index e8b67a4d13..3225afd146 100644 --- a/core/combo/include/arch/linux-mips64/AndroidConfig.h +++ b/core/combo/include/arch/linux-mips64/AndroidConfig.h @@ -111,25 +111,6 @@ #define _FILE_OFFSET_BITS 64 /* #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 header */ diff --git a/core/combo/include/arch/target_linux-x86/AndroidConfig.h b/core/combo/include/arch/target_linux-x86/AndroidConfig.h index 5a374c48dc..690bb43ba3 100644 --- a/core/combo/include/arch/target_linux-x86/AndroidConfig.h +++ b/core/combo/include/arch/target_linux-x86/AndroidConfig.h @@ -85,19 +85,12 @@ #endif /* #define _LARGEFILE_SOURCE 1 */ -/* - * Add any extra platform-specific defines here. - */ -#ifndef __linux__ -#define __linux__ -#endif - /* * Define if we have header */ #define HAVE_MALLOC_H -/* +/* * Define if we're running on *our* linux on device or emulator. */ #define HAVE_ANDROID_OS 1