From 107f1af3c4d968c68ef51e7954b78542df562021 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Wed, 3 Jun 2020 11:32:59 +0200 Subject: [PATCH] Fix desktop GL header not always being suppressed From upstream: https://github.com/glfw/glfw/commit/105cf32e0b05e207d4cd5efa462887569ca2116a. --- glfw/glfw3.h | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/glfw/glfw3.h b/glfw/glfw3.h index 34f26b543..22e5a2fdc 100644 --- a/glfw/glfw3.h +++ b/glfw/glfw3.h @@ -195,7 +195,22 @@ extern "C" { #endif /*__APPLE__*/ -#elif !defined(GLFW_INCLUDE_NONE) +#elif !defined(GLFW_INCLUDE_NONE) && \ + !defined(__gl_h_) && \ + !defined(__gles1_gl_h_) && \ + !defined(__gles2_gl2_h_) && \ + !defined(__gles2_gl3_h_) && \ + !defined(__gles2_gl31_h_) && \ + !defined(__gles2_gl32_h_) && \ + !defined(__gl_glcorearb_h_) && \ + !defined(__gl2_h_) /*legacy*/ && \ + !defined(__gl3_h_) /*legacy*/ && \ + !defined(__gl31_h_) /*legacy*/ && \ + !defined(__gl32_h_) /*legacy*/ && \ + !defined(__glcorearb_h_) /*legacy*/ && \ + !defined(__GL_H__) /*non-standard*/ && \ + !defined(__gltypes_h_) /*non-standard*/ && \ + !defined(__glee_h_) /*non-standard*/ #if defined(__APPLE__)