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

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

Browse Source 
* commit 'cc5809bf2fdae2ea7b5d84b21875cd2220c66105':
  ndk: Use __ANDROID__ instead of ANDROID.
This commit is contained in:
David 'Digit' Turner
2010-11-04 04:08:23 -07:00
committed by Android Git Automerger
parent 655f02a456 cc5809bf2f
commit f7b070255f
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

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

@@ -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

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>