From 93b91a87508b718eb75ac93889201dcd211a621a Mon Sep 17 00:00:00 2001 From: Glen Fraser Date: Thu, 6 Feb 2025 01:15:40 +0100 Subject: [PATCH] Fix Windows warnings about APIENTRY from GLAD library (#2339) * Fix Windows warnings about APIENTRY from GLAD library * Fix GLAD compilation issue on Mac/Linux --- include/glad/glad.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/include/glad/glad.h b/include/glad/glad.h index e897b698cf..17df517a79 100644 --- a/include/glad/glad.h +++ b/include/glad/glad.h @@ -472,6 +472,8 @@ #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 @@ -14158,4 +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