Merge pull request #184 from quink-black/dev

dispatch_common: fix conditional compilation

Symbols are always defined, but they are set to 0 or 1; this means we can't use `ifdef`.
macos/v1.5.9
Emmanuele Bassi 7 years ago committed by GitHub
commit e97162bad5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      src/dispatch_common.c

@ -551,7 +551,7 @@ epoxy_internal_has_gl_extension(const char *ext, bool invalid_op_mode)
bool bool
epoxy_load_glx(bool exit_if_fails, bool load) epoxy_load_glx(bool exit_if_fails, bool load)
{ {
#ifdef PLATFORM_HAS_GLX #if PLATFORM_HAS_GLX
# ifdef GLVND_GLX_LIB # ifdef GLVND_GLX_LIB
/* prefer the glvnd library if it exists */ /* prefer the glvnd library if it exists */
if (!api.glx_handle) if (!api.glx_handle)
@ -566,7 +566,7 @@ epoxy_load_glx(bool exit_if_fails, bool load)
void * void *
epoxy_conservative_glx_dlsym(const char *name, bool exit_if_fails) epoxy_conservative_glx_dlsym(const char *name, bool exit_if_fails)
{ {
#ifdef PLATFORM_HAS_GLX #if PLATFORM_HAS_GLX
if (epoxy_load_glx(exit_if_fails, exit_if_fails)) if (epoxy_load_glx(exit_if_fails, exit_if_fails))
return do_dlsym(&api.glx_handle, name, exit_if_fails); return do_dlsym(&api.glx_handle, name, exit_if_fails);
#endif #endif

Loading…
Cancel
Save