Add support for GLFW_NATIVE_INCLUDE_NONE macro

By default, the glfw3native.h header will include the platform-specific
headers necessary for the return types of GLFW native access functions.

Sometimes it is preferrable to declare those types

This commit adds support for the GLFW_NATIVE_INCLUDE_NONE macro, which
when defined disables the inclusion of all platform-specific headers.

Fixes #1348

(cherry picked from commit 05f6c13d11)

README.md

@@ -123,6 +123,7 @@ information on what to include when reporting a bug.
 
 ## Changelog
 
+ - Added `GLFW_NATIVE_INCLUDE_NONE` for disabling inclusion of native headers (#1348)
  - Bugfix: `glfwMakeContextCurrent` would access TLS slot before initialization
  - Bugfix: `glfwSetGammaRamp` could emit `GLFW_INVALID_VALUE` before initialization
  - Bugfix: `glfwGetJoystickUserPointer` returned `NULL` during disconnection (#2092)

include/GLFW/glfw3native.h

@@ -74,6 +74,16 @@ extern "C" {
  *  and which platform-specific headers to include.  It is then up your (by
  *  definition platform-specific) code to handle which of these should be
  *  defined.
+ *
+ *  If you do not want the platform-specific headers to be included, define
+ *  `GLFW_NATIVE_INCLUDE_NONE` before including the @ref glfw3native.h header.
+ *
+ *  @code
+ *  #define GLFW_EXPOSE_NATIVE_WIN32
+ *  #define GLFW_EXPOSE_NATIVE_WGL
+ *  #define GLFW_NATIVE_INCLUDE_NONE
+ *  #include <GLFW/glfw3native.h>
+ *  @endcode
  */
 
 
@@ -81,61 +91,65 @@ extern "C" {
  * System headers and types
  *************************************************************************/
 
-#if defined(GLFW_EXPOSE_NATIVE_WIN32) || defined(GLFW_EXPOSE_NATIVE_WGL)
+#if !defined(GLFW_NATIVE_INCLUDE_NONE)
- /* 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
-  */
- #if defined(GLFW_APIENTRY_DEFINED)
-  #undef APIENTRY
-  #undef GLFW_APIENTRY_DEFINED
- #endif
- #include <windows.h>
-#elif defined(GLFW_EXPOSE_NATIVE_COCOA) || defined(GLFW_EXPOSE_NATIVE_NSGL)
- #if defined(__OBJC__)
-  #import <Cocoa/Cocoa.h>
- #else
-  #include <ApplicationServices/ApplicationServices.h>
-  #include <objc/objc.h>
- #endif
-#elif defined(GLFW_EXPOSE_NATIVE_X11) || defined(GLFW_EXPOSE_NATIVE_GLX)
- #include <X11/Xlib.h>
- #include <X11/extensions/Xrandr.h>
-#elif defined(GLFW_EXPOSE_NATIVE_WAYLAND)
- #include <wayland-client.h>
-#endif
 
-#if defined(GLFW_EXPOSE_NATIVE_WGL)
+ #if defined(GLFW_EXPOSE_NATIVE_WIN32) || defined(GLFW_EXPOSE_NATIVE_WGL)
- /* WGL is declared by windows.h */
+  /* This is a workaround for the fact that glfw3.h needs to export APIENTRY (for
-#endif
+   * example to allow applications to correctly declare a GL_KHR_debug callback)
-#if defined(GLFW_EXPOSE_NATIVE_NSGL)
+   * but windows.h assumes no one will define APIENTRY before it does
- /* NSGL is declared by Cocoa.h */
+   */
-#endif
+  #if defined(GLFW_APIENTRY_DEFINED)
-#if defined(GLFW_EXPOSE_NATIVE_GLX)
+   #undef APIENTRY
- /* This is a workaround for the fact that glfw3.h defines GLAPIENTRY because by
+   #undef GLFW_APIENTRY_DEFINED
-  * default it also acts as an OpenGL header
+  #endif
-  * However, glx.h will include gl.h, which will define it unconditionally
+  #include <windows.h>
-  */
+ #elif defined(GLFW_EXPOSE_NATIVE_COCOA) || defined(GLFW_EXPOSE_NATIVE_NSGL)
- #if defined(GLFW_GLAPIENTRY_DEFINED)
+  #if defined(__OBJC__)
-  #undef GLAPIENTRY
+   #import <Cocoa/Cocoa.h>
-  #undef GLFW_GLAPIENTRY_DEFINED
+  #else
+   #include <ApplicationServices/ApplicationServices.h>
+   #include <objc/objc.h>
+  #endif
+ #elif defined(GLFW_EXPOSE_NATIVE_X11) || defined(GLFW_EXPOSE_NATIVE_GLX)
+  #include <X11/Xlib.h>
+  #include <X11/extensions/Xrandr.h>
+ #elif defined(GLFW_EXPOSE_NATIVE_WAYLAND)
+  #include <wayland-client.h>
  #endif
- #include <GL/glx.h>
+
-#endif
+ #if defined(GLFW_EXPOSE_NATIVE_WGL)
-#if defined(GLFW_EXPOSE_NATIVE_EGL)
+  /* WGL is declared by windows.h */
- #include <EGL/egl.h>
-#endif
-#if defined(GLFW_EXPOSE_NATIVE_OSMESA)
- /* This is a workaround for the fact that glfw3.h defines GLAPIENTRY because by
-  * default it also acts as an OpenGL header
-  * However, osmesa.h will include gl.h, which will define it unconditionally
-  */
- #if defined(GLFW_GLAPIENTRY_DEFINED)
-  #undef GLAPIENTRY
-  #undef GLFW_GLAPIENTRY_DEFINED
  #endif
- #include <GL/osmesa.h>
+ #if defined(GLFW_EXPOSE_NATIVE_NSGL)
-#endif
+  /* NSGL is declared by Cocoa.h */
+ #endif
+ #if defined(GLFW_EXPOSE_NATIVE_GLX)
+  /* This is a workaround for the fact that glfw3.h defines GLAPIENTRY because by
+   * default it also acts as an OpenGL header
+   * However, glx.h will include gl.h, which will define it unconditionally
+   */
+  #if defined(GLFW_GLAPIENTRY_DEFINED)
+   #undef GLAPIENTRY
+   #undef GLFW_GLAPIENTRY_DEFINED
+  #endif
+  #include <GL/glx.h>
+ #endif
+ #if defined(GLFW_EXPOSE_NATIVE_EGL)
+  #include <EGL/egl.h>
+ #endif
+ #if defined(GLFW_EXPOSE_NATIVE_OSMESA)
+  /* This is a workaround for the fact that glfw3.h defines GLAPIENTRY because by
+   * default it also acts as an OpenGL header
+   * However, osmesa.h will include gl.h, which will define it unconditionally
+   */
+  #if defined(GLFW_GLAPIENTRY_DEFINED)
+   #undef GLAPIENTRY
+   #undef GLFW_GLAPIENTRY_DEFINED
+  #endif
+  #include <GL/osmesa.h>
+ #endif
+
+#endif /*GLFW_NATIVE_INCLUDE_NONE*/
 
 
 /*************************************************************************