summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndroid (Google) Code Review <android-gerrit@google.com>2009-05-13 12:52:03 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2009-05-13 12:52:03 -0700
commit54c3551c61dc6673659a5c48b23d187e6ad1a157 (patch)
tree74425efea0684253dee8891782274d8f2555c864
parenta6c93fa24a81fcf08e127bf53398f795b42ce8d2 (diff)
parentfe0d7d79fb2e89f6a66bc0c2055d2111237d7742 (diff)
downloadframeworks_native-54c3551c61dc6673659a5c48b23d187e6ad1a157.zip
frameworks_native-54c3551c61dc6673659a5c48b23d187e6ad1a157.tar.gz
frameworks_native-54c3551c61dc6673659a5c48b23d187e6ad1a157.tar.bz2
am a2a34a5: Merge change 1528 into donut
Merge commit 'a2a34a5711bde03475b40edfe3cc052ece02700a' * commit 'a2a34a5711bde03475b40edfe3cc052ece02700a': should help fix the Simulator build.
-rw-r--r--opengl/libs/EGL/egl.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/opengl/libs/EGL/egl.cpp b/opengl/libs/EGL/egl.cpp
index 5ed3ecc..25e31ee 100644
--- a/opengl/libs/EGL/egl.cpp
+++ b/opengl/libs/EGL/egl.cpp
@@ -164,8 +164,8 @@ static pthread_key_t gEGLThreadLocalStorageKey = -1;
// ----------------------------------------------------------------------------
-gl_hooks_t gHooks[IMPL_NUM_IMPLEMENTATIONS];
-pthread_key_t gGLWrapperKey = -1;
+EGLAPI gl_hooks_t gHooks[IMPL_NUM_IMPLEMENTATIONS];
+EGLAPI pthread_key_t gGLWrapperKey = -1;
// ----------------------------------------------------------------------------