Skip to content

Commit

Permalink
Win32: resolve some symbols re-definition of windows.h in glfw3native…
Browse files Browse the repository at this point in the history
….h (#2643)

* Win32: resolve some symbols re-definition of windows.h in glfw3native.h

This reflects GLFW's fix: glfw/glfw#1348

This enables to build with a external GLFW containing the
following fix:

* glfw/glfw@05f6c13

Currently, glfw3native.h of the internal GLFW is customized at
2feea87

This fix is compatible with the current customized glfw3native.h.

This fix enables us to update it to the latest and remove the
customization.

* Win32: remove unneeded typedef
  • Loading branch information
daipom authored Aug 21, 2022
1 parent e835311 commit 7bb8ffc
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
3 changes: 0 additions & 3 deletions src/external/glfw/include/GLFW/glfw3native.h
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,6 @@ extern "C" {
// @raysan5: 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) || defined(GLFW_EXPOSE_NATIVE_NSGL)
#if defined(__OBJC__)
#import <Cocoa/Cocoa.h>
Expand Down
6 changes: 5 additions & 1 deletion src/rcore.c
Original file line number Diff line number Diff line change
Expand Up @@ -214,8 +214,12 @@

// Support retrieving native window handlers
#if defined(_WIN32)
typedef void *PVOID;
typedef PVOID HANDLE;
typedef HANDLE HWND;
#define GLFW_EXPOSE_NATIVE_WIN32
#include "GLFW/glfw3native.h" // WARNING: It requires customization to avoid windows.h inclusion!
#define GLFW_NATIVE_INCLUDE_NONE // To avoid some symbols re-definition in windows.h
#include "GLFW/glfw3native.h"

#if defined(SUPPORT_WINMM_HIGHRES_TIMER) && !defined(SUPPORT_BUSY_WAIT_LOOP)
// NOTE: Those functions require linking with winmm library
Expand Down

0 comments on commit 7bb8ffc

Please sign in to comment.