Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

Change condition for including static EGL #14

Merged
merged 1 commit into from

2 participants

@greggman

Is this an acceptable change? Not sure why it's && instead of ||. In my case I need it to be || since I'm not on android.

@nigels-com
Collaborator

Yeah, that just seems like an oversight on my part.
At first glance.

  • Nigel
@nigels-com nigels-com merged commit cacae21 into p3:master
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Sep 11, 2012
  1. @greggman
This page is out of date. Refresh to see the latest.
Showing with 2 additions and 2 deletions.
  1. +2 −2 src/regal/RegalDispatchGlobal.cpp
View
4 src/regal/RegalDispatchGlobal.cpp
@@ -44,7 +44,7 @@ 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
@@ -52,7 +52,7 @@ DispatchTableGlobal::DispatchTableGlobal()
{
memset(this,0,sizeof(DispatchTableGlobal));
-#if REGAL_SYS_ANDROID && REGAL_STATIC_EGL
+#if REGAL_SYS_ANDROID || REGAL_STATIC_EGL
InitDispatchTableStaticEGL(*this);
#endif
}
Something went wrong with that request. Please try again.