From 9ccb966a3ad5be1c5e3eab03c0ccf7840c2ce728 Mon Sep 17 00:00:00 2001 From: Camilla Berglund Date: Wed, 20 Aug 2014 17:50:29 +0200 Subject: [PATCH] Added APIENTRY hack to native header. --- include/GLFW/glfw3native.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/GLFW/glfw3native.h b/include/GLFW/glfw3native.h index 9915106a..35d6f49b 100644 --- a/include/GLFW/glfw3native.h +++ b/include/GLFW/glfw3native.h @@ -71,6 +71,10 @@ extern "C" { *************************************************************************/ #if defined(GLFW_EXPOSE_NATIVE_WIN32) + // This is a workaround for the fact that glfw3.h needs to export APIENTRY (for + // example to allow applications to correctly declare a GL_ARB_debug_output + // callback) but windows.h assumes no one will define APIENTRY before it does + #undef APIENTRY #include #elif defined(GLFW_EXPOSE_NATIVE_COCOA) #include