mirror/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2024-11-10 00:51:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Win32: Fix some of the errors for Null-only on VS

Browse Source 
This workaround is needed whenever windows.h is included after glfw3.h.
This commit is contained in:
Camilla Löwy 2024-01-10 00:47:18 +01:00
parent ab09dc8fb1
commit 9f6da7e7c6
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/win32_thread.h
View File

@ -25,6 +25,11 @@
// //
//======================================================================== //========================================================================
// This is a workaround for the fact that glfw3.h needs to export APIENTRY (for
// example to allow applications to correctly declare a GL_KHR_debug callback)
// but windows.h assumes no one will define APIENTRY before it does
#undef APIENTRY
#include <windows.h> #include <windows.h>
#define GLFW_WIN32_TLS_STATE _GLFWtlsWin32 win32; #define GLFW_WIN32_TLS_STATE _GLFWtlsWin32 win32;

5
src/win32_time.h
View File

@ -25,6 +25,11 @@
// //
//======================================================================== //========================================================================
// This is a workaround for the fact that glfw3.h needs to export APIENTRY (for
// example to allow applications to correctly declare a GL_KHR_debug callback)
// but windows.h assumes no one will define APIENTRY before it does
#undef APIENTRY
#include <windows.h> #include <windows.h>
#define GLFW_WIN32_LIBRARY_TIMER_STATE _GLFWtimerWin32 win32; #define GLFW_WIN32_LIBRARY_TIMER_STATE _GLFWtimerWin32 win32;