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

This workaround is needed whenever windows.h is included after glfw3.h.
master
Camilla Löwy ago%!(EXTRA string=1 year)
parent ab09dc8fb1
commit 9f6da7e7c6
  1. 5
      src/win32_thread.h
  2. 5
      src/win32_time.h

@ -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>
#define GLFW_WIN32_TLS_STATE _GLFWtlsWin32 win32;

@ -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>
#define GLFW_WIN32_LIBRARY_TIMER_STATE _GLFWtimerWin32 win32;

Loading…
Cancel
Save