diff options
| author | Murray Campbell <[email protected]> | 2018-10-24 14:33:53 -0500 |
|---|---|---|
| committer | GitHub <[email protected]> | 2018-10-24 14:33:53 -0500 |
| commit | 03fb5499a0f2c4b45ed1b2655a6e1e77221ed46a (patch) | |
| tree | 346e60c85c667b4e7650b7d3cd1c7ee3c8a54be5 /src/external/glfw/include | |
| parent | 9c6a98aa61b0a43c0d85347b3da26f90dd5c42fc (diff) | |
| parent | 72431c6c36a166b00e52527962ab4d978ab0111d (diff) | |
| download | raylib-03fb5499a0f2c4b45ed1b2655a6e1e77221ed46a.tar.gz raylib-03fb5499a0f2c4b45ed1b2655a6e1e77221ed46a.zip | |
Merge pull request #7 from raysan5/master
pull
Diffstat (limited to 'src/external/glfw/include')
| -rw-r--r-- | src/external/glfw/include/GLFW/glfw3native.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/external/glfw/include/GLFW/glfw3native.h b/src/external/glfw/include/GLFW/glfw3native.h index 4372cb76..d585496c 100644 --- a/src/external/glfw/include/GLFW/glfw3native.h +++ b/src/external/glfw/include/GLFW/glfw3native.h @@ -90,13 +90,21 @@ 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__) #import <Cocoa/Cocoa.h> #else - typedef void* id; + // RAY: Added protection in case OBJC types defined + #if !OBJC_TYPES_DEFINED + typedef void* id; + #endif #endif #elif defined(GLFW_EXPOSE_NATIVE_X11) #include <X11/Xlib.h> |