diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-06-30 16:08:24 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-06-30 16:08:24 -0700 |
| commit | 177c405a242e811b1010bd8382b5807ab8df31a8 (patch) | |
| tree | 6931bc5a00c2bf75d6b3c31754fa1d7bbe3da03d /opengl/include/EGL/eglplatform.h | |
| parent | e341a0b5e9a1e30a020970a69c58c34f902ea06f (diff) | |
| parent | c6e1d88022db800773401c16803e1ab27fd01a7e (diff) | |
| download | frameworks_base-177c405a242e811b1010bd8382b5807ab8df31a8.zip frameworks_base-177c405a242e811b1010bd8382b5807ab8df31a8.tar.gz frameworks_base-177c405a242e811b1010bd8382b5807ab8df31a8.tar.bz2 | |
am c6e1d880: Merge "Introduce official public NativeWindow type." into gingerbread
Merge commit 'c6e1d88022db800773401c16803e1ab27fd01a7e' into gingerbread-plus-aosp
* commit 'c6e1d88022db800773401c16803e1ab27fd01a7e':
Introduce official public NativeWindow type.
Diffstat (limited to 'opengl/include/EGL/eglplatform.h')
| -rw-r--r-- | opengl/include/EGL/eglplatform.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/opengl/include/EGL/eglplatform.h b/opengl/include/EGL/eglplatform.h index a2c6a7d..25d7697 100644 --- a/opengl/include/EGL/eglplatform.h +++ b/opengl/include/EGL/eglplatform.h @@ -91,10 +91,11 @@ typedef Window EGLNativeWindowType; #elif defined(ANDROID) -struct android_native_window_t; +#include <android/native_window.h> + struct egl_native_pixmap_t; -typedef struct android_native_window_t* EGLNativeWindowType; +typedef struct ANativeWindow* EGLNativeWindowType; typedef struct egl_native_pixmap_t* EGLNativePixmapType; typedef void* EGLNativeDisplayType; |