diff options
| author | Ray <[email protected]> | 2018-10-08 18:08:39 +0200 |
|---|---|---|
| committer | Ray <[email protected]> | 2018-10-08 18:08:39 +0200 |
| commit | 2652e7d1c1051852e7f2ebf0e71396ac645c6713 (patch) | |
| tree | dcd462914fc18a6557df07ec40bed353277a3009 /src/external/glfw/include | |
| parent | 81d28c5784f300b0d2437b004a09fd0fe391dda9 (diff) | |
| download | raylib-2652e7d1c1051852e7f2ebf0e71396ac645c6713.tar.gz raylib-2652e7d1c1051852e7f2ebf0e71396ac645c6713.zip | |
Avoid multiple gl.h inclusions
Expose native Cocoa Window again...
Diffstat (limited to 'src/external/glfw/include')
| -rw-r--r-- | src/external/glfw/include/GLFW/glfw3native.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/external/glfw/include/GLFW/glfw3native.h b/src/external/glfw/include/GLFW/glfw3native.h index 84bb3399..463a7a71 100644 --- a/src/external/glfw/include/GLFW/glfw3native.h +++ b/src/external/glfw/include/GLFW/glfw3native.h @@ -101,7 +101,10 @@ extern "C" { #if defined(__OBJC__) #import <Cocoa/Cocoa.h> #else - typedef void* id; + // RAY: Added protection in case OBJC types defined + #if !defined(OBJC_TYPES_DEFINED) + typedef void* id; + #endif #endif #elif defined(GLFW_EXPOSE_NATIVE_X11) #include <X11/Xlib.h> |