From 23698eed7b26ae22f85ed7330788a218d3250bf0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sun, 19 Jul 2020 16:18:51 +0200 Subject: [PATCH] external: print an error when gl32.h is encountered as well. Followup to 80a844c6c5256b1c77a04db22f8042891b521c0b, forgot this initially. --- .../OpenGL/GLES3/Emscripten/flextGLEmscripten.h.template | 2 +- src/MagnumExternal/OpenGL/GLES3/flextGL.h | 2 +- src/MagnumExternal/OpenGL/GLES3/flextGL.h.template | 2 +- src/MagnumExternal/OpenGL/GLES3/flextGLEmscripten.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/MagnumExternal/OpenGL/GLES3/Emscripten/flextGLEmscripten.h.template b/src/MagnumExternal/OpenGL/GLES3/Emscripten/flextGLEmscripten.h.template index 9d20bf954..602425683 100644 --- a/src/MagnumExternal/OpenGL/GLES3/Emscripten/flextGLEmscripten.h.template +++ b/src/MagnumExternal/OpenGL/GLES3/Emscripten/flextGLEmscripten.h.template @@ -31,7 +31,7 @@ /* Defensive include guards */ -#if defined(__gl_h_) || defined(__gl2_h_) || defined(__gl3_h_) || defined(__gl31_h_) +#if defined(__gl_h_) || defined(__gl2_h_) || defined(__gl3_h_) || defined(__gl31_h_) || defined(__gl32_h_) #error Attempt to include auto-generated header after including gl3.h #endif #if defined(__gl2ext_h_) || defined(__gl3ext_h_) diff --git a/src/MagnumExternal/OpenGL/GLES3/flextGL.h b/src/MagnumExternal/OpenGL/GLES3/flextGL.h index 3c75a8bc6..2646beb90 100644 --- a/src/MagnumExternal/OpenGL/GLES3/flextGL.h +++ b/src/MagnumExternal/OpenGL/GLES3/flextGL.h @@ -33,7 +33,7 @@ /* Defensive include guards */ -#if defined(__gl_h_) || defined(__gl2_h_) || defined(__gl3_h_) || defined(__gl31_h_) +#if defined(__gl_h_) || defined(__gl2_h_) || defined(__gl3_h_) || defined(__gl31_h_) || defined(__gl32_h_) #error Attempt to include auto-generated header after including gl3.h #endif #if defined(__gl2ext_h_) || defined(__gl3ext_h_) diff --git a/src/MagnumExternal/OpenGL/GLES3/flextGL.h.template b/src/MagnumExternal/OpenGL/GLES3/flextGL.h.template index b01d24f8f..3a3b7e090 100644 --- a/src/MagnumExternal/OpenGL/GLES3/flextGL.h.template +++ b/src/MagnumExternal/OpenGL/GLES3/flextGL.h.template @@ -34,7 +34,7 @@ /* Defensive include guards */ -#if defined(__gl_h_) || defined(__gl2_h_) || defined(__gl3_h_) || defined(__gl31_h_) +#if defined(__gl_h_) || defined(__gl2_h_) || defined(__gl3_h_) || defined(__gl31_h_) || defined(__gl32_h_) #error Attempt to include auto-generated header after including gl3.h #endif #if defined(__gl2ext_h_) || defined(__gl3ext_h_) diff --git a/src/MagnumExternal/OpenGL/GLES3/flextGLEmscripten.h b/src/MagnumExternal/OpenGL/GLES3/flextGLEmscripten.h index ad53d152e..ca10170ca 100644 --- a/src/MagnumExternal/OpenGL/GLES3/flextGLEmscripten.h +++ b/src/MagnumExternal/OpenGL/GLES3/flextGLEmscripten.h @@ -30,7 +30,7 @@ /* Defensive include guards */ -#if defined(__gl_h_) || defined(__gl2_h_) || defined(__gl3_h_) || defined(__gl31_h_) +#if defined(__gl_h_) || defined(__gl2_h_) || defined(__gl3_h_) || defined(__gl31_h_) || defined(__gl32_h_) #error Attempt to include auto-generated header after including gl3.h #endif #if defined(__gl2ext_h_) || defined(__gl3ext_h_)