LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am f7b07025: am cc5809bf: Merge "ndk: Use __ANDROID__ instead of ANDROID." into gingerbread

Browse Source 
* commit 'f7b070255f964af5eef0e2562d892058786df2db':
  ndk: Use __ANDROID__ instead of ANDROID.
This commit is contained in:
David 'Digit' Turner
2010-11-04 10:57:23 -07:00
committed by Android Git Automerger
parent 40090497c6 f7b070255f
commit fd94292af2
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ndk/platforms/android-4/include/GLES/glplatform.h
View File

@@ -24,7 +24,7 @@
#define GL_API KHRONOS_APICALL #define GL_API KHRONOS_APICALL
#endif #endif
#if defined(ANDROID) #if defined(__ANDROID__)
#define GL_APIENTRY KHRONOS_APIENTRY #define GL_APIENTRY KHRONOS_APIENTRY

20
ndk/platforms/android-4/include/KHR/khrplatform.h
View File

@@ -26,7 +26,7 @@
/* Platform-specific types and definitions. /* Platform-specific types and definitions.
* $Revision: 7244 $ on $Date: 2009-01-20 17:06:59 -0800 (Tue, 20 Jan 2009) $ * $Revision: 7244 $ on $Date: 2009-01-20 17:06:59 -0800 (Tue, 20 Jan 2009) $
* *
* Adopters may modify this file to suit their platform. Adopters are * Adopters may modify this file to suit their platform. Adopters are
* encouraged to submit platform specific modifications to the Khronos * encouraged to submit platform specific modifications to the Khronos
* group so that they can be included in future versions of this file. * group so that they can be included in future versions of this file.
@@ -37,13 +37,13 @@
* A predefined template which fills in some of the bug fields can be * A predefined template which fills in some of the bug fields can be
* reached using http://tinyurl.com/khrplatform-h-bugreport, but you * reached using http://tinyurl.com/khrplatform-h-bugreport, but you
* must create a Bugzilla login first. * must create a Bugzilla login first.
* *
* *
* See the Implementer's Guidelines for information about where this file * See the Implementer's Guidelines for information about where this file
* should be located on your system. * should be located on your system.
* http://www.khronos.org/registry/implementers_guide.pdf * http://www.khronos.org/registry/implementers_guide.pdf
* *
* *
* This file should be included as * This file should be included as
* #include <KHR/khrplatform.h> * #include <KHR/khrplatform.h>
* by the Khronos API header file that uses its types and defines. * by the Khronos API header file that uses its types and defines.
@@ -70,7 +70,7 @@
* *
* KHRONOS_SUPPORT_INT64 is 1 if 64 bit integers are supported; otherwise 0. * KHRONOS_SUPPORT_INT64 is 1 if 64 bit integers are supported; otherwise 0.
* KHRONOS_SUPPORT_FLOAT is 1 if floats are supported; otherwise 0. * KHRONOS_SUPPORT_FLOAT is 1 if floats are supported; otherwise 0.
* *
* *
* Macros defined in this file: * Macros defined in this file:
* KHRONOS_APICALL * KHRONOS_APICALL
@@ -91,7 +91,7 @@
# define KHRONOS_APICALL __declspec(dllimport) # define KHRONOS_APICALL __declspec(dllimport)
#elif defined (__SYMBIAN32__) #elif defined (__SYMBIAN32__)
# define KHRONOS_APICALL IMPORT_C # define KHRONOS_APICALL IMPORT_C
#elif defined(ANDROID) #elif defined(__ANDROID__)
# define KHRONOS_APICALL __attribute__((visibility("default"))) # define KHRONOS_APICALL __attribute__((visibility("default")))
#else #else
# define KHRONOS_APICALL # define KHRONOS_APICALL
@@ -228,11 +228,11 @@ typedef float khronos_float_t;
#if KHRONOS_SUPPORT_INT64 #if KHRONOS_SUPPORT_INT64
/* Time types /* Time types
* *
* These types can be used to represent a time interval in nanoseconds or * These types can be used to represent a time interval in nanoseconds or
* an absolute Unadjusted System Time. Unadjusted System Time is the number * an absolute Unadjusted System Time. Unadjusted System Time is the number
* of nanoseconds since some arbitrary system event (e.g. since the last * of nanoseconds since some arbitrary system event (e.g. since the last
* time the system booted). The Unadjusted System Time is an unsigned * time the system booted). The Unadjusted System Time is an unsigned
* 64 bit value that wraps back to 0 every 584 years. Time intervals * 64 bit value that wraps back to 0 every 584 years. Time intervals
* may be either signed or unsigned. * may be either signed or unsigned.
*/ */
typedef khronos_uint64_t khronos_utime_nanoseconds_t; typedef khronos_uint64_t khronos_utime_nanoseconds_t;

4
ndk/platforms/android-9/include/EGL/eglplatform.h
View File

@@ -78,7 +78,7 @@ typedef int EGLNativeDisplayType;
typedef void *EGLNativeWindowType; typedef void *EGLNativeWindowType;
typedef void *EGLNativePixmapType; typedef void *EGLNativePixmapType;
#elif defined(__unix__) && !defined(ANDROID) #elif defined(__unix__) && !defined(__ANDROID__)
/* X11 (tentative) */ /* X11 (tentative) */
#include <X11/Xlib.h> #include <X11/Xlib.h>
@@ -89,7 +89,7 @@ typedef Pixmap EGLNativePixmapType;
typedef Window EGLNativeWindowType; typedef Window EGLNativeWindowType;
#elif defined(ANDROID) #elif defined(__ANDROID__)
#include <android/native_window.h> #include <android/native_window.h>