diff options
| author | David 'Digit' Turner <digit@google.com> | 2010-11-09 16:12:06 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-11-09 16:12:06 -0800 |
| commit | b7a109c02735bb0d9e0bcb8f84e4aa3923701460 (patch) | |
| tree | 87d6bbf1a7efeeb453f9c292eaf24acd22cf8691 | |
| parent | a784d5528f6fa07a48bb7de9dcfa04eb60044927 (diff) | |
| parent | 71438310b52482588dc8b4a2f2cb71652208c070 (diff) | |
| download | base-b7a109c02735bb0d9e0bcb8f84e4aa3923701460.tar.gz | |
Merge "Refresh EGL header to work with the NDK" into gingerbread
| -rw-r--r-- | opengl/include/EGL/eglplatform.h | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/opengl/include/EGL/eglplatform.h b/opengl/include/EGL/eglplatform.h index 25d7697ee3be..bfac71bec674 100644 --- a/opengl/include/EGL/eglplatform.h +++ b/opengl/include/EGL/eglplatform.h @@ -78,18 +78,7 @@ typedef int EGLNativeDisplayType; typedef void *EGLNativeWindowType; typedef void *EGLNativePixmapType; -#elif defined(__unix__) && !defined(ANDROID) - -/* X11 (tentative) */ -#include <X11/Xlib.h> -#include <X11/Xutil.h> - -typedef Display *EGLNativeDisplayType; -typedef Pixmap EGLNativePixmapType; -typedef Window EGLNativeWindowType; - - -#elif defined(ANDROID) +#elif defined(__ANDROID__) || defined(ANDROID) #include <android/native_window.h> @@ -99,6 +88,16 @@ typedef struct ANativeWindow* EGLNativeWindowType; typedef struct egl_native_pixmap_t* EGLNativePixmapType; typedef void* EGLNativeDisplayType; +#elif defined(__unix__) + +/* X11 (tentative) */ +#include <X11/Xlib.h> +#include <X11/Xutil.h> + +typedef Display *EGLNativeDisplayType; +typedef Pixmap EGLNativePixmapType; +typedef Window EGLNativeWindowType; + #else #error "Platform not recognized" #endif |