From 8cd4bfe47ea8ace9fc1f0ecf0eb68c844ab7a326 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 20 Dec 2015 20:21:02 +0300 Subject: Fix regal and nacl conflict in headers. --- src/render/modernopenglgraphics.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/render/modernopenglgraphics.cpp') diff --git a/src/render/modernopenglgraphics.cpp b/src/render/modernopenglgraphics.cpp index ea28bec4d..61dec9b03 100644 --- a/src/render/modernopenglgraphics.cpp +++ b/src/render/modernopenglgraphics.cpp @@ -29,10 +29,10 @@ #include "graphicsvertexes.h" #include "logger.h" +#include "render/opengl/mgl.h" #ifdef __native_client__ #include "render/opengl/naclglfunctions.h" #endif -#include "render/opengl/mgl.h" #include "render/shaders/shaderprogram.h" #include "render/shaders/shadersmanager.h" -- cgit v1.2.3-60-g2f50