commit 11abc8a36d639775b05a0471c9ea45d83fa19e56
author Mathias Agopian <mathias@google.com> Thu May 14 22:44:23 2009 -0700
committer Mathias Agopian <mathias@google.com> Thu May 14 22:44:23 2009 -0700
tree edf234f013ef3c88507f81dea65b8187cc672564
parent 6ec72e3fa9cdf9e896f3042fb1b1b4f3f6cea541
parent e52a5a5fca18348728dfc5609b42b88e9cc7ef98

Merge commit 'goog/master' into merge_master

Conflicts:
	opengl/libagl/Android.mk
	opengl/libs/Android.mk
	opengl/libs/egl_impl.h

opengl/libs/egl_impl.h

diff --git a/opengl/libs/egl_impl.h b/opengl/libs/egl_impl.h
index 4e0c7bf..80455d0 100644
--- a/opengl/libs/egl_impl.h
+++ b/opengl/libs/egl_impl.h
@@ -21,6 +21,7 @@
 
 #include <EGL/egl.h>
 #include <EGL/eglext.h>
+#include <EGL/eglplatform.h>
 
 // ----------------------------------------------------------------------------
 namespace android {
@@ -37,7 +38,7 @@
     int                 unavailable;
 };
 
-EGLImageKHR egl_get_image_for_current_context(EGLImageKHR image);
+EGLAPI EGLImageKHR egl_get_image_for_current_context(EGLImageKHR image);
 
 // ----------------------------------------------------------------------------
 }; // namespace android