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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: gpu/command_buffer/common/gl_mock.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: Fix build issues 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
« no previous file with comments | « gpu/DEPS ('k') | gpu/command_buffer/service/framebuffer_manager_unittest.cc » ('j') | gpu/command_buffer/service/framebuffer_manager_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/command_buffer/common/gl_mock.h
diff --git a/gpu/command_buffer/common/gl_mock.h b/gpu/command_buffer/common/gl_mock.h
index bdd328c01ba35838bbc0e2ccb9fd87cfd82f76af..be51a29bc11e939de9adf8a5f71e155b55b39fce 100644
--- a/gpu/command_buffer/common/gl_mock.h
+++ b/gpu/command_buffer/common/gl_mock.h
@@ -9,6 +9,14 @@
#define GPU_COMMAND_BUFFER_COMMON_GL_MOCK_H_
#pragma once
+#if defined(USE_X11)
Ami GONE FROM CHROMIUM 2011/09/21 22:21:42 Ditto comment on id_manager_unittest.cc.
dominich 2011/09/22 17:00:15 Done.
+// These are defined by both gtest and Xlib so we need to undefine them before
+// including the gtest header. Obviously the gtest definition will replace the
+// Xlib one for the remainder of this file.
+#undef Bool
+#undef None
+#undef Status
+#endif
#include "testing/gmock/include/gmock/gmock.h"
#include "ui/gfx/gl/gl_interface.h"
@@ -447,4 +455,3 @@ class MockGLInterface : public GLInterface {
} // namespace gfx
#endif // GPU_COMMAND_BUFFER_COMMON_GL_MOCK_H_
-
« no previous file with comments | « gpu/DEPS ('k') | gpu/command_buffer/service/framebuffer_manager_unittest.cc » ('j') | gpu/command_buffer/service/framebuffer_manager_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698