diff options
| author | David 'Digit' Turner <digit@google.com> | 2010-11-09 16:42:27 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-11-09 16:42:27 -0800 |
| commit | 8cbb85dc4687cd3b83b7f8f430d3a44487175b58 (patch) | |
| tree | f05a94fb6f190a6441c0212ef6899a802cbb8918 /opengl | |
| parent | 21c1114dad3a778992479ec8ef514e412a7b2646 (diff) | |
| parent | b02ca27f05a47fad75c57d6d8c52ccc5b21a8043 (diff) | |
| download | frameworks_base-8cbb85dc4687cd3b83b7f8f430d3a44487175b58.zip frameworks_base-8cbb85dc4687cd3b83b7f8f430d3a44487175b58.tar.gz frameworks_base-8cbb85dc4687cd3b83b7f8f430d3a44487175b58.tar.bz2 | |
am b02ca27f: am b7a109c0: Merge "Refresh EGL header to work with the NDK" into gingerbread
* commit 'b02ca27f05a47fad75c57d6d8c52ccc5b21a8043':
Refresh EGL header to work with the NDK
Diffstat (limited to 'opengl')
| -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 25d7697..bfac71b 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 |