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

* commit '899b18775b24379e8b4555f4327f6b5c07306608':
  remove __linux__ in AndroidConfig.h
This commit is contained in:
Yabin Cui 2014-11-11 17:45:15 +00:00 committed by Android Git Automerger
commit b082f088e2
5 changed files with 2 additions and 61 deletions

View File

@ -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 <malloc.h> header
*/
#define HAVE_MALLOC_H
/*
/*
* Define if we're running on *our* linux on device or emulator.
*/
#define HAVE_ANDROID_OS 1

View File

@ -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 <malloc.h> header
*/

View File

@ -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 <malloc.h> header
*/

View File

@ -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 <malloc.h> header
*/

View File

@ -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 <malloc.h> header
*/
#define HAVE_MALLOC_H
/*
/*
* Define if we're running on *our* linux on device or emulator.
*/
#define HAVE_ANDROID_OS 1