From ef9ffbc287417520d223ce29dc6c2de110cac945 Mon Sep 17 00:00:00 2001 From: Mikko Rasa Date: Thu, 6 Jun 2019 15:57:11 +0300 Subject: [PATCH] Avoid some brain damage from Windows headers --- source/programcompiler.cpp | 2 ++ source/programparser.cpp | 2 ++ source/programsyntax.h | 6 ++++++ 3 files changed, 10 insertions(+) diff --git a/source/programcompiler.cpp b/source/programcompiler.cpp index 5a17a9ed..7cf79515 100644 --- a/source/programcompiler.cpp +++ b/source/programcompiler.cpp @@ -8,6 +8,8 @@ #include "resources.h" #include "shader.h" +#undef interface + using namespace std; namespace { diff --git a/source/programparser.cpp b/source/programparser.cpp index c02adb32..4f08b977 100644 --- a/source/programparser.cpp +++ b/source/programparser.cpp @@ -3,6 +3,8 @@ #include #include "programparser.h" +#undef interface + using namespace std; namespace Msp { diff --git a/source/programsyntax.h b/source/programsyntax.h index 5e107a33..6a03f40f 100644 --- a/source/programsyntax.h +++ b/source/programsyntax.h @@ -7,6 +7,10 @@ #include #include #include "extension.h" +#include "uniform.h" + +#pragma push_macro("interface") +#undef interface namespace Msp { namespace GL { @@ -401,4 +405,6 @@ struct Module } // namespace GL } // namespace Msp +#pragma pop_macro("interface") + #endif -- 2.43.0