diff options
| author | Bryan Kadzban <github@kadzban.net> | 2016-09-06 22:28:39 -0700 |
|---|---|---|
| committer | Bryan Kadzban <github@kadzban.net> | 2016-09-06 22:28:39 -0700 |
| commit | 58610268fe41cb92a12700c1094a7cdf57c5b092 (patch) | |
| tree | c2b6896cb4eab61612f440873dcc9f1faef0f964 /include | |
| parent | b8d609e8f9fc1f9c4ff359adb2c1c44619a9e7cf (diff) | |
| download | libepoxy-58610268fe41cb92a12700c1094a7cdf57c5b092.tar.gz | |
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.
Diffstat (limited to 'include')
| -rw-r--r-- | include/epoxy/glx.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/epoxy/glx.h b/include/epoxy/glx.h index 6d41c26..3ef1dfc 100644 --- a/include/epoxy/glx.h +++ b/include/epoxy/glx.h @@ -30,11 +30,12 @@ #ifndef 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". #endif #define GLX_H +#define __glx_h__ #define __glxext_h_ #include "epoxy/gl.h" |