Merge pull request #2 from BryanKadzban/master

nVidia glx.h uses __glx_h__; define that too.
macos/v1.5.9
Yaron Cohen-Tal 8 years ago committed by GitHub
commit 594e2e082a
  1. 3
      include/epoxy/glx.h

@ -30,11 +30,12 @@
#ifndef EPOXY_GLX_H #ifndef EPOXY_GLX_H
#define EPOXY_GLX_H #define EPOXY_GLX_H
#if defined(GLX_H) || defined(__glxext_h_) #if defined(GLX_H) || defined(__glx_h__) || defined(__glxext_h_)
#error "epoxy/glx.h" must be included before (or in place of) "GL/glx.h". #error "epoxy/glx.h" must be included before (or in place of) "GL/glx.h".
#endif #endif
#define GLX_H #define GLX_H
#define __glx_h__
#define __glxext_h_ #define __glxext_h_
#include "epoxy/gl.h" #include "epoxy/gl.h"

Loading…
Cancel
Save