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

Unified Diff: ui/gfx/gl/gl_bindings.h

Issue 7889040: Change X11 error handler override to allow easy X11 error checking. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Adding DCHECK for MessageLoop correctness Created 9 years, 3 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
Index: ui/gfx/gl/gl_bindings.h
diff --git a/ui/gfx/gl/gl_bindings.h b/ui/gfx/gl/gl_bindings.h
index 3615e8857749b0c87f1dfe0d97175420b870da16..fcf6e7509f3f7eff0c18c01995335adde589bcf5 100644
--- a/ui/gfx/gl/gl_bindings.h
+++ b/ui/gfx/gl/gl_bindings.h
@@ -26,12 +26,6 @@
#elif defined(USE_X11)
#include <GL/glx.h>
#include <GL/glxext.h>
-
-// Undefine some macros defined by X headers. This is why this file should only
-// be included in .cc files.
-#undef Bool
-#undef None
-#undef Status
#endif
#if defined(OS_WIN)

Powered by Google App Engine
This is Rietveld 408576698