From 59c8f7eb756abad0b8d44d01dd29d3268fc1f006 Mon Sep 17 00:00:00 2001 From: Glen Fraser Date: Thu, 23 Jan 2025 14:37:20 +0100 Subject: [PATCH] Fix GLAD compilation issue on Mac/Linux --- include/glad/glad.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/include/glad/glad.h b/include/glad/glad.h index e9070cf734..17df517a79 100644 --- a/include/glad/glad.h +++ b/include/glad/glad.h @@ -466,15 +466,14 @@ #ifndef __glad_h_ #define __glad_h_ -#pragma push_macro("APIENTRY") - - #ifdef __gl_h_ #error OpenGL header already included, remove this include, glad already provides it #endif #define __gl_h_ #if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__) +#pragma push_macro("APIENTRY") +#define GLAD_PUSHED_APIENTRY #define APIENTRY __stdcall #endif @@ -14161,6 +14160,9 @@ GLAPI int GLAD_GL_S3_s3tc; } #endif +#ifdef GLAD_PUSHED_APIENTRY +#undef GLAD_PUSHED_APIENTRY #pragma pop_macro("APIENTRY") +#endif // GLAD_PUSHED_APIENTRY #endif