From 537ea4ccf1deb7b5e00c3745ab51e82a8c0696dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Camilla=20L=C3=B6wy?= Date: Fri, 24 May 2019 17:17:15 +0200 Subject: [PATCH] Explicitly disable inclusion for test and examples Thank you, Travis CI, for reminding me that one cannot disable a header with inclusion guards if it doesn't exist. --- examples/boing.c | 1 + examples/gears.c | 1 + examples/heightmap.c | 1 + examples/offscreen.c | 1 + examples/particles.c | 1 + examples/sharing.c | 1 + examples/splitview.c | 1 + examples/triangle-opengl.c | 1 + examples/wave.c | 1 + tests/clipboard.c | 1 + tests/cursor.c | 1 + tests/empty.c | 1 + tests/events.c | 1 + tests/gamma.c | 1 + tests/glfwinfo.c | 1 + tests/icon.c | 1 + tests/iconify.c | 1 + tests/inputlag.c | 1 + tests/joysticks.c | 1 + tests/monitors.c | 1 + tests/msaa.c | 1 + tests/opacity.c | 1 + tests/reopen.c | 1 + tests/tearing.c | 1 + tests/threads.c | 1 + tests/timeout.c | 1 + tests/title.c | 1 + tests/windows.c | 1 + 28 files changed, 28 insertions(+) diff --git a/examples/boing.c b/examples/boing.c index 2ffddbd65..ca389086a 100644 --- a/examples/boing.c +++ b/examples/boing.c @@ -37,6 +37,7 @@ #include #include +#define GLFW_INCLUDE_NONE #include #include diff --git a/examples/gears.c b/examples/gears.c index 4c7d9a988..292f44b59 100644 --- a/examples/gears.c +++ b/examples/gears.c @@ -32,6 +32,7 @@ #include #include +#define GLFW_INCLUDE_NONE #include /** diff --git a/examples/heightmap.c b/examples/heightmap.c index bd38339a5..13a3c1e14 100644 --- a/examples/heightmap.c +++ b/examples/heightmap.c @@ -30,6 +30,7 @@ #include #include +#define GLFW_INCLUDE_NONE #include /* Map height updates */ diff --git a/examples/offscreen.c b/examples/offscreen.c index 4f717cb59..eca37c481 100644 --- a/examples/offscreen.c +++ b/examples/offscreen.c @@ -24,6 +24,7 @@ //======================================================================== #include +#define GLFW_INCLUDE_NONE #include #if USE_NATIVE_OSMESA diff --git a/examples/particles.c b/examples/particles.c index 29889149b..248c85163 100644 --- a/examples/particles.c +++ b/examples/particles.c @@ -40,6 +40,7 @@ #include #include +#define GLFW_INCLUDE_NONE #include // Define tokens for GL_EXT_separate_specular_color if not already defined diff --git a/examples/sharing.c b/examples/sharing.c index 34936011d..4a1a2323d 100644 --- a/examples/sharing.c +++ b/examples/sharing.c @@ -24,6 +24,7 @@ //======================================================================== #include +#define GLFW_INCLUDE_NONE #include #include diff --git a/examples/splitview.c b/examples/splitview.c index 1e02b7780..58eb11ef9 100644 --- a/examples/splitview.c +++ b/examples/splitview.c @@ -11,6 +11,7 @@ //======================================================================== #include +#define GLFW_INCLUDE_NONE #include #if defined(_MSC_VER) diff --git a/examples/triangle-opengl.c b/examples/triangle-opengl.c index fef7f8fd5..00bc37dd3 100644 --- a/examples/triangle-opengl.c +++ b/examples/triangle-opengl.c @@ -25,6 +25,7 @@ //! [code] #include +#define GLFW_INCLUDE_NONE #include #include "linmath.h" diff --git a/examples/wave.c b/examples/wave.c index 32d78c6ae..7acb8b929 100644 --- a/examples/wave.c +++ b/examples/wave.c @@ -18,6 +18,7 @@ #include #include +#define GLFW_INCLUDE_NONE #include #include diff --git a/tests/clipboard.c b/tests/clipboard.c index c6093ce55..41454a3ca 100644 --- a/tests/clipboard.c +++ b/tests/clipboard.c @@ -28,6 +28,7 @@ //======================================================================== #include +#define GLFW_INCLUDE_NONE #include #include diff --git a/tests/cursor.c b/tests/cursor.c index 3edadf025..b6288f6ac 100644 --- a/tests/cursor.c +++ b/tests/cursor.c @@ -31,6 +31,7 @@ //======================================================================== #include +#define GLFW_INCLUDE_NONE #include #if defined(_MSC_VER) diff --git a/tests/empty.c b/tests/empty.c index ae87f849d..c3877a715 100644 --- a/tests/empty.c +++ b/tests/empty.c @@ -30,6 +30,7 @@ #include "tinycthread.h" #include +#define GLFW_INCLUDE_NONE #include #include diff --git a/tests/events.c b/tests/events.c index f1dde4569..ba7f00ab0 100644 --- a/tests/events.c +++ b/tests/events.c @@ -32,6 +32,7 @@ //======================================================================== #include +#define GLFW_INCLUDE_NONE #include #include diff --git a/tests/gamma.c b/tests/gamma.c index c625447b6..aa4c8b783 100644 --- a/tests/gamma.c +++ b/tests/gamma.c @@ -29,6 +29,7 @@ //======================================================================== #include +#define GLFW_INCLUDE_NONE #include #define NK_IMPLEMENTATION diff --git a/tests/glfwinfo.c b/tests/glfwinfo.c index d3a089d7d..afc32427d 100644 --- a/tests/glfwinfo.c +++ b/tests/glfwinfo.c @@ -25,6 +25,7 @@ #include #include +#define GLFW_INCLUDE_NONE #include #include diff --git a/tests/icon.c b/tests/icon.c index 301923f70..aa7ee1817 100644 --- a/tests/icon.c +++ b/tests/icon.c @@ -28,6 +28,7 @@ //======================================================================== #include +#define GLFW_INCLUDE_NONE #include #include diff --git a/tests/iconify.c b/tests/iconify.c index 2224a67e7..ff446d2d8 100644 --- a/tests/iconify.c +++ b/tests/iconify.c @@ -29,6 +29,7 @@ //======================================================================== #include +#define GLFW_INCLUDE_NONE #include #include diff --git a/tests/inputlag.c b/tests/inputlag.c index f6f5befe9..269a0c8f9 100644 --- a/tests/inputlag.c +++ b/tests/inputlag.c @@ -29,6 +29,7 @@ //======================================================================== #include +#define GLFW_INCLUDE_NONE #include #define NK_IMPLEMENTATION diff --git a/tests/joysticks.c b/tests/joysticks.c index 17ca76063..8eae021e4 100644 --- a/tests/joysticks.c +++ b/tests/joysticks.c @@ -29,6 +29,7 @@ //======================================================================== #include +#define GLFW_INCLUDE_NONE #include #define NK_IMPLEMENTATION diff --git a/tests/monitors.c b/tests/monitors.c index d35dfe1fa..30ce40889 100644 --- a/tests/monitors.c +++ b/tests/monitors.c @@ -29,6 +29,7 @@ //======================================================================== #include +#define GLFW_INCLUDE_NONE #include #include diff --git a/tests/msaa.c b/tests/msaa.c index 45d7df7ad..33e2ccc3b 100644 --- a/tests/msaa.c +++ b/tests/msaa.c @@ -30,6 +30,7 @@ //======================================================================== #include +#define GLFW_INCLUDE_NONE #include #if defined(_MSC_VER) diff --git a/tests/opacity.c b/tests/opacity.c index 5c086ec72..47f28b16b 100644 --- a/tests/opacity.c +++ b/tests/opacity.c @@ -24,6 +24,7 @@ //======================================================================== #include +#define GLFW_INCLUDE_NONE #include #define NK_IMPLEMENTATION diff --git a/tests/reopen.c b/tests/reopen.c index e077092d2..10d22b28b 100644 --- a/tests/reopen.c +++ b/tests/reopen.c @@ -34,6 +34,7 @@ //======================================================================== #include +#define GLFW_INCLUDE_NONE #include #include diff --git a/tests/tearing.c b/tests/tearing.c index 8b28d396d..17a3f0e40 100644 --- a/tests/tearing.c +++ b/tests/tearing.c @@ -29,6 +29,7 @@ //======================================================================== #include +#define GLFW_INCLUDE_NONE #include #include diff --git a/tests/threads.c b/tests/threads.c index 70a93aa9a..982949336 100644 --- a/tests/threads.c +++ b/tests/threads.c @@ -31,6 +31,7 @@ #include "tinycthread.h" #include +#define GLFW_INCLUDE_NONE #include #include diff --git a/tests/timeout.c b/tests/timeout.c index e025dfaa8..bda2560c7 100644 --- a/tests/timeout.c +++ b/tests/timeout.c @@ -28,6 +28,7 @@ //======================================================================== #include +#define GLFW_INCLUDE_NONE #include #include diff --git a/tests/title.c b/tests/title.c index ca8dc5f9e..a5bad3422 100644 --- a/tests/title.c +++ b/tests/title.c @@ -28,6 +28,7 @@ //======================================================================== #include +#define GLFW_INCLUDE_NONE #include #include diff --git a/tests/windows.c b/tests/windows.c index 296ee937c..6669856f1 100644 --- a/tests/windows.c +++ b/tests/windows.c @@ -28,6 +28,7 @@ //======================================================================== #include +#define GLFW_INCLUDE_NONE #include #include