move SOKOL_IMPL vs SOKOL_xxx_IMPL outside the include guard

14 files changed, 42 insertions, 42 deletions

diff --git a/sokol_app.h b/sokol_app.h
index 2362ff53..0bdc30ba 100644
--- a/sokol_app.h
+++ b/sokol_app.h
@@ -1,3 +1,6 @@
+#if defined(SOKOL_IMPL) && !defined(SOKOL_APP_IMPL)
+#define SOKOL_APP_IMPL
+#endif
 #ifndef SOKOL_APP_INCLUDED
 /*
     sokol_app.h -- cross-platform application wrapper
@@ -861,9 +864,6 @@
 #include <stdint.h>
 #include <stdbool.h>
 
-#if defined(SOKOL_IMPL) && !defined(SOKOL_APP_IMPL)
-#define SOKOL_APP_IMPL
-#endif
 #if defined(SOKOL_API_DECL) && !defined(SOKOL_APP_API_DECL)
 #define SOKOL_APP_API_DECL SOKOL_API_DECL
 #endif
diff --git a/sokol_args.h b/sokol_args.h
index b7496ed4..994ba593 100644
--- a/sokol_args.h
+++ b/sokol_args.h
@@ -1,3 +1,6 @@
+#if defined(SOKOL_IMPL) && !defined(SOKOL_ARGS_IMPL)
+#define SOKOL_ARGS_IMPL
+#endif
 #ifndef SOKOL_ARGS_INCLUDED
 /*
     sokol_args.h    -- cross-platform key/value arg-parsing for web and native
@@ -249,9 +252,6 @@
 #include <stdint.h>
 #include <stdbool.h>
 
-#if defined(SOKOL_IMPL) && !defined(SOKOL_ARGS_IMPL)
-#define SOKOL_ARGS_IMPL
-#endif
 #if defined(SOKOL_API_DECL) && !defined(SOKOL_ARGS_API_DECL)
 #define SOKOL_ARGS_API_DECL SOKOL_API_DECL
 #endif
diff --git a/sokol_audio.h b/sokol_audio.h
index 6dad34d9..8a6f8db7 100644
--- a/sokol_audio.h
+++ b/sokol_audio.h
@@ -1,3 +1,6 @@
+#if defined(SOKOL_IMPL) && !defined(SOKOL_AUDIO_IMPL)
+#define SOKOL_AUDIO_IMPL
+#endif
 #ifndef SOKOL_AUDIO_INCLUDED
 /*
     sokol_audio.h -- cross-platform audio-streaming API
@@ -376,9 +379,6 @@
 #include <stdint.h>
 #include <stdbool.h>
 
-#if defined(SOKOL_IMPL) && !defined(SOKOL_AUDIO_IMPL)
-#define SOKOL_AUDIO_IMPL
-#endif
 #if defined(SOKOL_API_DECL) && !defined(SOKOL_AUDIO_API_DECL)
 #define SOKOL_AUDIO_API_DECL SOKOL_API_DECL
 #endif
diff --git a/sokol_fetch.h b/sokol_fetch.h
index 6b11fd79..95324729 100644
--- a/sokol_fetch.h
+++ b/sokol_fetch.h
@@ -1,3 +1,6 @@
+#if defined(SOKOL_IMPL) && !defined(SOKOL_FETCH_IMPL)
+#define SOKOL_FETCH_IMPL
+#endif
 #ifndef SOKOL_FETCH_INCLUDED
 /*
     sokol_fetch.h -- asynchronous data loading/streaming
@@ -831,9 +834,6 @@
 #include <stdint.h>
 #include <stdbool.h>
 
-#if defined(SOKOL_IMPL) && !defined(SOKOL_FETCH_IMPL)
-#define SOKOL_FETCH_IMPL
-#endif
 #if defined(SOKOL_API_DECL) && !defined(SOKOL_FETCH_API_DECL)
 #define SOKOL_FETCH_API_DECL SOKOL_API_DECL
 #endif
diff --git a/sokol_gfx.h b/sokol_gfx.h
index cf2eacea..3173bb71 100644
--- a/sokol_gfx.h
+++ b/sokol_gfx.h
@@ -1,3 +1,6 @@
+#if defined(SOKOL_IMPL) && !defined(SOKOL_GFX_IMPL)
+#define SOKOL_GFX_IMPL
+#endif
 #ifndef SOKOL_GFX_INCLUDED
 /*
     sokol_gfx.h -- simple 3D API wrapper
@@ -575,9 +578,6 @@
 #include <stdint.h>
 #include <stdbool.h>
 
-#if defined(SOKOL_IMPL) && !defined(SOKOL_GFX_IMPL)
-#define SOKOL_GFX_IMPL
-#endif
 #if defined(SOKOL_API_DECL) && !defined(SOKOL_GFX_API_DECL)
 #define SOKOL_GFX_API_DECL SOKOL_API_DECL
 #endif
diff --git a/sokol_glue.h b/sokol_glue.h
index ef379c58..74ecb7c3 100644
--- a/sokol_glue.h
+++ b/sokol_glue.h
@@ -1,3 +1,6 @@
+#if defined(SOKOL_IMPL) && !defined(SOKOL_GLUE_IMPL)
+#define SOKOL_GLUE_IMPL
+#endif
 #ifndef SOKOL_GLUE_INCLUDED
 /*
     sokol_glue.h -- glue helper functions for sokol headers
@@ -73,9 +76,6 @@
 */
 #define SOKOL_GLUE_INCLUDED
 
-#if defined(SOKOL_IMPL) && !defined(SOKOL_GLUE_IMPL)
-#define SOKOL_GLUE_IMPL
-#endif
 #if defined(SOKOL_API_DECL) && !defined(SOKOL_GLUE_API_DECL)
 #define SOKOL_GLUE_API_DECL SOKOL_API_DECL
 #endif
diff --git a/sokol_time.h b/sokol_time.h
index c1ebf1d5..29ecdacf 100644
--- a/sokol_time.h
+++ b/sokol_time.h
@@ -1,3 +1,6 @@
+#if defined(SOKOL_IMPL) && !defined(SOKOL_TIME_IMPL)
+#define SOKOL_TIME_IMPL
+#endif
 #ifndef SOKOL_TIME_INCLUDED
 /*
     sokol_time.h    -- simple cross-platform time measurement
@@ -103,9 +106,6 @@
 #define SOKOL_TIME_INCLUDED (1)
 #include <stdint.h>
 
-#if defined(SOKOL_IMPL) && !defined(SOKOL_TIME_IMPL)
-#define SOKOL_TIME_IMPL
-#endif
 #if defined(SOKOL_API_DECL) && !defined(SOKOL_TIME_API_DECL)
 #define SOKOL_TIME_API_DECL SOKOL_API_DECL
 #endif
diff --git a/util/sokol_debugtext.h b/util/sokol_debugtext.h
index c88e3065..b07bfe39 100644
--- a/util/sokol_debugtext.h
+++ b/util/sokol_debugtext.h
@@ -1,3 +1,6 @@
+#if defined(SOKOL_IMPL) && !defined(SOKOL_DEBUGTEXT_IMPL)
+#define SOKOL_DEBUGTEXT_IMPL
+#endif
 #ifndef SOKOL_DEBUGTEXT_INCLUDED
 /*
     sokol_debugtext.h   - simple ASCII debug text rendering on top of sokol_gfx.h
@@ -394,9 +397,6 @@
 #error "Please include sokol_gfx.h before sokol_debugtext.h"
 #endif
 
-#if defined(SOKOL_IMPL) && !defined(SOKOL_DEBUGTEXT_IMPL)
-#define SOKOL_DEBUGTEXT_IMPL
-#endif
 #if defined(SOKOL_API_DECL) && !defined(SOKOL_DEBUGTEXT_API_DECL)
 #define SOKOL_DEBUGTEXT_API_DECL SOKOL_API_DECL
 #endif
diff --git a/util/sokol_fontstash.h b/util/sokol_fontstash.h
index a741c723..1db20019 100644
--- a/util/sokol_fontstash.h
+++ b/util/sokol_fontstash.h
@@ -1,3 +1,6 @@
+#if defined(SOKOL_IMPL) && !defined(SOKOL_FONTSTASH_IMPL)
+#define SOKOL_FONTSTASH_IMPL
+#endif
 #ifndef SOKOL_FONTSTASH_INCLUDED
 /*
     sokol_fontstash.h -- renderer for https://github.com/memononen/fontstash
@@ -160,9 +163,6 @@
 #error "Please include sokol_gfx.h before sokol_fontstash.h"
 #endif
 
-#if defined(SOKOL_IMPL) && !defined(SOKOL_FONTSTASH_IMPL)
-#define SOKOL_FONTSTASH_IMPL
-#endif
 #if defined(SOKOL_API_DECL) && !defined(SOKOL_FONTSTASH_API_DECL)
 #define SOKOL_FONTSTASH_API_DECL SOKOL_API_DECL
 #endif
diff --git a/util/sokol_gfx_imgui.h b/util/sokol_gfx_imgui.h
index 1897a75e..4ec064d2 100644
--- a/util/sokol_gfx_imgui.h
+++ b/util/sokol_gfx_imgui.h
@@ -1,3 +1,6 @@
+#if defined(SOKOL_IMPL) && !defined(SOKOL_GFX_IMGUI_IMPL)
+#define SOKOL_GFX_IMGUI_IMPL
+#endif
 #ifndef SOKOL_GFX_IMGUI_INCLUDED
 /*
     sokol_gfx_imgui.h -- debug-inspection UI for sokol_gfx.h using Dear ImGui
@@ -166,9 +169,6 @@
 #error "Please include sokol_gfx.h before sokol_gfx_imgui.h"
 #endif
 
-#if defined(SOKOL_IMPL) && !defined(SOKOL_GFX_IMGUI_IMPL)
-#define SOKOL_GFX_IMGUI_IMPL
-#endif
 #if defined(SOKOL_API_DECL) && !defined(SOKOL_GFX_IMGUI_API_DECL)
 #define SOKOL_GFX_IMGUI_API_DECL SOKOL_API_DECL
 #endif
diff --git a/util/sokol_gl.h b/util/sokol_gl.h
index dea8083d..04895170 100644
--- a/util/sokol_gl.h
+++ b/util/sokol_gl.h
@@ -1,3 +1,6 @@
+#if defined(SOKOL_IMPL) && !defined(SOKOL_GL_IMPL)
+#define SOKOL_GL_IMPL
+#endif
 #ifndef SOKOL_GL_INCLUDED
 /*
     sokol_gl.h -- OpenGL 1.x style rendering on top of sokol_gfx.h
@@ -447,9 +450,6 @@
 #error "Please include sokol_gfx.h before sokol_gl.h"
 #endif
 
-#if defined(SOKOL_IMPL) && !defined(SOKOL_GL_IMPL)
-#define SOKOL_GL_IMPL
-#endif
 #if defined(SOKOL_API_DECL) && !defined(SOKOL_GL_API_DECL)
 #define SOKOL_GL_API_DECL SOKOL_API_DECL
 #endif
diff --git a/util/sokol_imgui.h b/util/sokol_imgui.h
index a43f4233..590e5ca8 100644
--- a/util/sokol_imgui.h
+++ b/util/sokol_imgui.h
@@ -1,3 +1,6 @@
+#if defined(SOKOL_IMPL) && !defined(SOKOL_IMGUI_IMPL)
+#define SOKOL_IMGUI_IMPL
+#endif
 #ifndef SOKOL_IMGUI_INCLUDED
 /*
     sokol_imgui.h -- drop-in Dear ImGui renderer/event-handler for sokol_gfx.h
@@ -205,9 +208,6 @@
 #error "Please include sokol_app.h before sokol_imgui.h"
 #endif
 
-#if defined(SOKOL_IMPL) && !defined(SOKOL_IMGUI_IMPL)
-#define SOKOL_IMGUI_IMPL
-#endif
 #if defined(SOKOL_API_DECL) && !defined(SOKOL_IMGUI_API_DECL)
 #define SOKOL_IMGUI_API_DECL SOKOL_API_DECL
 #endif
diff --git a/util/sokol_memtrack.h b/util/sokol_memtrack.h
index 34319913..b795e16f 100644
--- a/util/sokol_memtrack.h
+++ b/util/sokol_memtrack.h
@@ -1,3 +1,6 @@
+#if defined(SOKOL_IMPL) && !defined(SOKOL_MEMTRACK_IMPL)
+#define SOKOL_MEMTRACK_IMPL
+#endif
 #ifndef SOKOL_MEMTRACK_INCLUDED
 /*
     sokol_memtrack.h -- memory allocation wrapper to track memory usage
@@ -74,9 +77,6 @@
 #include <stddef.h>
 #include <stdint.h>
 
-#if defined(SOKOL_IMPL) && !defined(SOKOL_MEMTRACK_IMPL)
-#define SOKOL_MEMTRACK_IMPL
-#endif
 #if defined(SOKOL_API_DECL) && !defined(SOKOL_MEMTRACK_API_DECL)
 #define SOKOL_MEMTRACK_API_DECL SOKOL_API_DECL
 #endif
diff --git a/util/sokol_shape.h b/util/sokol_shape.h
index 7ced17e9..2c54ac53 100644
--- a/util/sokol_shape.h
+++ b/util/sokol_shape.h
@@ -1,3 +1,6 @@
+#if defined(SOKOL_IMPL) && !defined(SOKOL_SHAPE_IMPL)
+#define SOKOL_SHAPE_IMPL
+#endif
 #ifndef SOKOL_SHAPE_INCLUDED
 /*
     sokol_shape.h -- create simple primitive shapes for sokol_gfx.h
@@ -366,9 +369,6 @@
 #error "Please include sokol_gfx.h before sokol_shape.h"
 #endif
 
-#if defined(SOKOL_IMPL) && !defined(SOKOL_SHAPE_IMPL)
-#define SOKOL_SHAPE_IMPL
-#endif
 #if defined(SOKOL_API_DECL) && !defined(SOKOL_SHAPE_API_DECL)
 #define SOKOL_SHAPE_API_DECL SOKOL_API_DECL
 #endif