Index: gpu/command_buffer/service/program_manager_unittest.cc |
diff --git a/gpu/command_buffer/service/program_manager_unittest.cc b/gpu/command_buffer/service/program_manager_unittest.cc |
index c58cda1d0a0899530a44335d6175ce4aa06248a1..b5f7cc3a27dd73f0d01905de26f053ccbba213b0 100644 |
--- a/gpu/command_buffer/service/program_manager_unittest.cc |
+++ b/gpu/command_buffer/service/program_manager_unittest.cc |
@@ -2,6 +2,11 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
+// Include gtest.h out of order because <X11/X.h> #define's Bool & None, which |
+// gtest uses as struct names (inside a namespace). This means that |
+// #include'ing gtest after anything that pulls in X.h fails to compile. |
+// This is http://code.google.com/p/googletest/issues/detail?id=371 |
+#include "testing/gtest/include/gtest/gtest.h" |
#include "gpu/command_buffer/service/program_manager.h" |
#include <algorithm> |
@@ -900,5 +905,3 @@ TEST_F(ProgramManagerWithShaderTest, ProgramInfoGetProgramInfo) { |
} // namespace gles2 |
} // namespace gpu |
- |
- |