diff options
| author | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-28 17:56:32 +0000 |
|---|---|---|
| committer | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-28 17:56:32 +0000 |
| commit | 546b044cd3922985803c1609faa9ccb27418e27d (patch) | |
| tree | 3c5811648505f1108c35864eccca484dd7dbcdcf | |
| parent | 11b2467a75b5b7890a094f93d8c6fdedd62c4954 (diff) | |
| download | chromium_src-546b044cd3922985803c1609faa9ccb27418e27d.zip chromium_src-546b044cd3922985803c1609faa9ccb27418e27d.tar.gz chromium_src-546b044cd3922985803c1609faa9ccb27418e27d.tar.bz2 | |
Merged in fixes for GLEW compile errors on linux.
GLEW patch: http://glew.svn.sourceforge.net/viewvc/glew?view=rev&revision=596
GLEW bug: http://sourceforge.net/tracker/index.php?func=detail&aid=2992222&group_id=67586&atid=523274
TEST=trybots
BUG=41039
Review URL: http://codereview.chromium.org/1727010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45827 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | third_party/glew/include/GL/glxew.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/third_party/glew/include/GL/glxew.h b/third_party/glew/include/GL/glxew.h index d37afd6..fd2f1e5 100644 --- a/third_party/glew/include/GL/glxew.h +++ b/third_party/glew/include/GL/glxew.h @@ -83,13 +83,16 @@ #ifdef __glxext_h_ #error glxext.h included before glxew.h #endif -#ifdef GLX_H + +#if defined(GLX_H) || defined(__GLX_glx_h__) || defined(__glx_h__) #error glx.h included before glxew.h #endif #define __glxext_h_ -#define __GLX_glx_h__ + #define GLX_H +#define __GLX_glx_h__ +#define __glx_h__ #include <X11/Xlib.h> #include <X11/Xutil.h> |