Merge branch 'master' into epoxy

[movit] / flat_input_test.cpp

diff --git a/flat_input_test.cpp b/flat_input_test.cpp
index a29762326ddac60b8d1e7e4046353ba8b3feb484..397cae3c26d788f7abe5ed10ba064f23b60d2cbd 100644 (file)
--- a/flat_input_test.cpp
+++ b/flat_input_test.cpp
@@ -1,6 +1,6 @@
 // Unit tests for FlatInput.
 
-#include <GL/glew.h>
+#include <epoxy/gl.h>
 #include <stddef.h>
 
 #include "effect_chain.h"
@@ -9,6 +9,8 @@
 #include "test_util.h"
 #include "util.h"
 
+namespace movit {
+
 TEST(FlatInput, SimpleGrayscale) {
        const int size = 4;
 
@@ -264,3 +266,5 @@ TEST(FlatInput, PBO) {
 
        glDeleteBuffers(1, &pbo);
 }
+
+}  // namespace movit