nVidia glx.h uses __glx_h__; define that too.

The code used to check this symbol, but commit 689abf4 replaced it with
GLX_H, presumably to work better with either Mesa or Khronos headers.
But nVidia's header use the older include guard. Add it as another
option.

Should fix the headerguards.c compile test when the system glx.h is from
nVidia's binary drivers.
macos/v1.5.9
Bryan Kadzban 8 years ago
parent b8d609e8f9
commit 58610268fe
  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