Fix windows build

This commit is contained in:
Milan Nikolic 2018-10-08 19:36:48 +02:00
parent e8965ee263
commit 70aa6f5da5
2 changed files with 7 additions and 2 deletions

View file

@ -90,7 +90,12 @@ extern "C" {
#undef APIENTRY
#undef GLFW_APIENTRY_DEFINED
#endif
#include <windows.h>
// RAY: Actually, only HWND handler needs to be defined
// Including windows.h could suppose symbols re-definition issues (i.e Rectangle type)
//#include <windows.h>
typedef void *PVOID;
typedef PVOID HANDLE;
typedef HANDLE HWND;
#elif defined(GLFW_EXPOSE_NATIVE_COCOA)
#include <ApplicationServices/ApplicationServices.h>
#if defined(__OBJC__)

View file

@ -193,7 +193,7 @@
#undef __forceinline
#endif
#define __forceinline
#define alloca __builtin_alloca
//#define alloca __builtin_alloca
#elif !defined(_MSC_VER)
#if __GNUC__
#define __forceinline inline