Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(286)

Unified Diff: third_party/glew/include/GL/glxew.h

Issue 3014046: Merge 45827 - Merged in fixes for GLEW compile errors on linux.... (Closed) Base URL: svn://svn.chromium.org/chrome/branches/375/src/
Patch Set: Created 10 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/glew/include/GL/glxew.h
===================================================================
--- third_party/glew/include/GL/glxew.h (revision 54505)
+++ third_party/glew/include/GL/glxew.h (working copy)
@@ -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_H
#define __GLX_glx_h__
-#define GLX_H
+#define __glx_h__
#include <X11/Xlib.h>
#include <X11/Xutil.h>
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698