Skip to content
Browse files

Merge branch 'change-egl-condition' of git://github.com/greggman/regal

  • Loading branch information...
2 parents 978dc3a + cacae21 commit fcb69b111a82f94e682a26c2e11770cf31f28079 @nigels-com nigels-com committed Sep 12, 2012
Showing with 2 additions and 2 deletions.
  1. +2 −2 src/regal/RegalDispatchGlobal.cpp
View
4 src/regal/RegalDispatchGlobal.cpp
@@ -44,15 +44,15 @@ REGAL_NAMESPACE_BEGIN
DispatchTableGlobal dispatchTableGlobal;
-#if REGAL_SYS_ANDROID && REGAL_STATIC_EGL
+#if REGAL_SYS_ANDROID || REGAL_STATIC_EGL
extern void InitDispatchTableStaticEGL(DispatchTableGlobal &tbl);
#endif
DispatchTableGlobal::DispatchTableGlobal()
{
memset(this,0,sizeof(DispatchTableGlobal));
-#if REGAL_SYS_ANDROID && REGAL_STATIC_EGL
+#if REGAL_SYS_ANDROID || REGAL_STATIC_EGL
InitDispatchTableStaticEGL(*this);
#endif
}

0 comments on commit fcb69b1

Please sign in to comment.
Something went wrong with that request. Please try again.