Pārlūkot izejas kodu

include: Renamed begin_code.h and close_code.h to have SDL_ prefixes.

Fixes #6864.
Ryan C. Gordon 2 gadi atpakaļ
vecāks
revīzija
3197632347
70 mainītis faili ar 167 papildinājumiem un 164 dzēšanām
  1. 2 2
      VisualC-GDK/SDL/SDL.vcxproj
  2. 2 2
      VisualC-GDK/SDL/SDL.vcxproj.filters
  3. 2 2
      VisualC-WinRT/SDL-UWP.vcxproj
  4. 2 2
      VisualC-WinRT/SDL-UWP.vcxproj.filters
  5. 2 2
      VisualC/SDL/SDL.vcxproj
  6. 2 2
      VisualC/SDL/SDL.vcxproj.filters
  7. 20 20
      Xcode/SDL/SDL.xcodeproj/project.pbxproj
  8. 3 0
      docs/README-migration.md
  9. 2 2
      include/SDL3/SDL_assert.h
  10. 2 2
      include/SDL3/SDL_atomic.h
  11. 2 2
      include/SDL3/SDL_audio.h
  12. 5 5
      include/SDL3/SDL_begin_code.h
  13. 2 2
      include/SDL3/SDL_bits.h
  14. 2 2
      include/SDL3/SDL_blendmode.h
  15. 2 2
      include/SDL3/SDL_clipboard.h
  16. 5 5
      include/SDL3/SDL_close_code.h
  17. 2 2
      include/SDL3/SDL_cpuinfo.h
  18. 2 2
      include/SDL3/SDL_endian.h
  19. 2 2
      include/SDL3/SDL_error.h
  20. 2 2
      include/SDL3/SDL_events.h
  21. 2 2
      include/SDL3/SDL_filesystem.h
  22. 2 2
      include/SDL3/SDL_gamecontroller.h
  23. 2 2
      include/SDL3/SDL_guid.h
  24. 2 2
      include/SDL3/SDL_haptic.h
  25. 2 2
      include/SDL3/SDL_hidapi.h
  26. 2 2
      include/SDL3/SDL_hints.h
  27. 2 2
      include/SDL3/SDL_init.h
  28. 2 2
      include/SDL3/SDL_joystick.h
  29. 2 2
      include/SDL3/SDL_keyboard.h
  30. 2 2
      include/SDL3/SDL_loadso.h
  31. 2 2
      include/SDL3/SDL_locale.h
  32. 2 2
      include/SDL3/SDL_log.h
  33. 2 2
      include/SDL3/SDL_main.h
  34. 4 4
      include/SDL3/SDL_main_impl.h
  35. 2 2
      include/SDL3/SDL_messagebox.h
  36. 2 2
      include/SDL3/SDL_metal.h
  37. 2 2
      include/SDL3/SDL_misc.h
  38. 2 2
      include/SDL3/SDL_mouse.h
  39. 2 2
      include/SDL3/SDL_mutex.h
  40. 2 2
      include/SDL3/SDL_pixels.h
  41. 2 2
      include/SDL3/SDL_platform.h
  42. 2 2
      include/SDL3/SDL_power.h
  43. 2 2
      include/SDL3/SDL_rect.h
  44. 2 2
      include/SDL3/SDL_render.h
  45. 2 2
      include/SDL3/SDL_rwops.h
  46. 2 2
      include/SDL3/SDL_sensor.h
  47. 2 2
      include/SDL3/SDL_shape.h
  48. 2 2
      include/SDL3/SDL_stdinc.h
  49. 2 2
      include/SDL3/SDL_surface.h
  50. 2 2
      include/SDL3/SDL_system.h
  51. 2 2
      include/SDL3/SDL_syswm.h
  52. 2 2
      include/SDL3/SDL_test.h
  53. 2 2
      include/SDL3/SDL_test_assert.h
  54. 2 2
      include/SDL3/SDL_test_common.h
  55. 2 2
      include/SDL3/SDL_test_compare.h
  56. 2 2
      include/SDL3/SDL_test_crc32.h
  57. 2 2
      include/SDL3/SDL_test_font.h
  58. 2 2
      include/SDL3/SDL_test_fuzzer.h
  59. 2 2
      include/SDL3/SDL_test_harness.h
  60. 2 2
      include/SDL3/SDL_test_images.h
  61. 2 2
      include/SDL3/SDL_test_log.h
  62. 2 2
      include/SDL3/SDL_test_md5.h
  63. 2 2
      include/SDL3/SDL_test_memory.h
  64. 2 2
      include/SDL3/SDL_test_random.h
  65. 2 2
      include/SDL3/SDL_thread.h
  66. 2 2
      include/SDL3/SDL_timer.h
  67. 2 2
      include/SDL3/SDL_touch.h
  68. 2 2
      include/SDL3/SDL_version.h
  69. 2 2
      include/SDL3/SDL_video.h
  70. 2 2
      include/SDL3/SDL_vulkan.h

+ 2 - 2
VisualC-GDK/SDL/SDL.vcxproj

@@ -288,8 +288,8 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\include\SDL3\begin_code.h" />
-    <ClInclude Include="..\..\include\SDL3\close_code.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_begin_code.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_close_code.h" />
     <ClInclude Include="..\..\include\SDL3\SDL.h" />
     <ClInclude Include="..\..\include\SDL3\SDL_assert.h" />
     <ClInclude Include="..\..\include\SDL3\SDL_atomic.h" />

+ 2 - 2
VisualC-GDK/SDL/SDL.vcxproj.filters

@@ -174,10 +174,10 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\include\SDL3\begin_code.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_begin_code.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL3\close_code.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_close_code.h">
       <Filter>API Headers</Filter>
     </ClInclude>
     <ClInclude Include="..\..\include\SDL3\SDL.h">

+ 2 - 2
VisualC-WinRT/SDL-UWP.vcxproj

@@ -35,8 +35,8 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\include\SDL3\begin_code.h" />
-    <ClInclude Include="..\include\SDL3\close_code.h" />
+    <ClInclude Include="..\include\SDL3\SDL_begin_code.h" />
+    <ClInclude Include="..\include\SDL3\SDL_close_code.h" />
     <ClInclude Include="..\include\SDL3\SDL.h" />
     <ClInclude Include="..\include\SDL3\SDL_assert.h" />
     <ClInclude Include="..\include\SDL3\SDL_atomic.h" />

+ 2 - 2
VisualC-WinRT/SDL-UWP.vcxproj.filters

@@ -9,10 +9,10 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\include\SDL3\begin_code.h">
+    <ClInclude Include="..\include\SDL3\SDL_begin_code.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\SDL3\close_code.h">
+    <ClInclude Include="..\include\SDL3\SDL_close_code.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\SDL3\SDL.h">

+ 2 - 2
VisualC/SDL/SDL.vcxproj

@@ -234,8 +234,8 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\include\SDL3\begin_code.h" />
-    <ClInclude Include="..\..\include\SDL3\close_code.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_begin_code.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_close_code.h" />
     <ClInclude Include="..\..\include\SDL3\SDL.h" />
     <ClInclude Include="..\..\include\SDL3\SDL_assert.h" />
     <ClInclude Include="..\..\include\SDL3\SDL_atomic.h" />

+ 2 - 2
VisualC/SDL/SDL.vcxproj.filters

@@ -171,10 +171,10 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\include\SDL3\begin_code.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_begin_code.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL3\close_code.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_close_code.h">
       <Filter>API Headers</Filter>
     </ClInclude>
     <ClInclude Include="..\..\include\SDL3\SDL.h">

+ 20 - 20
Xcode/SDL/SDL.xcodeproj/project.pbxproj

@@ -3444,18 +3444,18 @@
 		F3F7D9D62933074E00816151 /* SDL_version.h in Headers */ = {isa = PBXBuildFile; fileRef = F3F7D8E42933074D00816151 /* SDL_version.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		F3F7D9D72933074E00816151 /* SDL_version.h in Headers */ = {isa = PBXBuildFile; fileRef = F3F7D8E42933074D00816151 /* SDL_version.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		F3F7D9D82933074E00816151 /* SDL_version.h in Headers */ = {isa = PBXBuildFile; fileRef = F3F7D8E42933074D00816151 /* SDL_version.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		F3F7D9D92933074E00816151 /* close_code.h in Headers */ = {isa = PBXBuildFile; fileRef = F3F7D8E52933074D00816151 /* close_code.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		F3F7D9DA2933074E00816151 /* close_code.h in Headers */ = {isa = PBXBuildFile; fileRef = F3F7D8E52933074D00816151 /* close_code.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		F3F7D9DB2933074E00816151 /* close_code.h in Headers */ = {isa = PBXBuildFile; fileRef = F3F7D8E52933074D00816151 /* close_code.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		F3F7D9DC2933074E00816151 /* close_code.h in Headers */ = {isa = PBXBuildFile; fileRef = F3F7D8E52933074D00816151 /* close_code.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		F3F7D9D92933074E00816151 /* SDL_close_code.h in Headers */ = {isa = PBXBuildFile; fileRef = F3F7D8E52933074D00816151 /* SDL_close_code.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		F3F7D9DA2933074E00816151 /* SDL_close_code.h in Headers */ = {isa = PBXBuildFile; fileRef = F3F7D8E52933074D00816151 /* SDL_close_code.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		F3F7D9DB2933074E00816151 /* SDL_close_code.h in Headers */ = {isa = PBXBuildFile; fileRef = F3F7D8E52933074D00816151 /* SDL_close_code.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		F3F7D9DC2933074E00816151 /* SDL_close_code.h in Headers */ = {isa = PBXBuildFile; fileRef = F3F7D8E52933074D00816151 /* SDL_close_code.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		F3F7D9DD2933074E00816151 /* SDL_mutex.h in Headers */ = {isa = PBXBuildFile; fileRef = F3F7D8E62933074E00816151 /* SDL_mutex.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		F3F7D9DE2933074E00816151 /* SDL_mutex.h in Headers */ = {isa = PBXBuildFile; fileRef = F3F7D8E62933074E00816151 /* SDL_mutex.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		F3F7D9DF2933074E00816151 /* SDL_mutex.h in Headers */ = {isa = PBXBuildFile; fileRef = F3F7D8E62933074E00816151 /* SDL_mutex.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		F3F7D9E02933074E00816151 /* SDL_mutex.h in Headers */ = {isa = PBXBuildFile; fileRef = F3F7D8E62933074E00816151 /* SDL_mutex.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		F3F7D9E12933074E00816151 /* begin_code.h in Headers */ = {isa = PBXBuildFile; fileRef = F3F7D8E72933074E00816151 /* begin_code.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		F3F7D9E22933074E00816151 /* begin_code.h in Headers */ = {isa = PBXBuildFile; fileRef = F3F7D8E72933074E00816151 /* begin_code.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		F3F7D9E32933074E00816151 /* begin_code.h in Headers */ = {isa = PBXBuildFile; fileRef = F3F7D8E72933074E00816151 /* begin_code.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		F3F7D9E42933074E00816151 /* begin_code.h in Headers */ = {isa = PBXBuildFile; fileRef = F3F7D8E72933074E00816151 /* begin_code.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		F3F7D9E12933074E00816151 /* SDL_begin_code.h in Headers */ = {isa = PBXBuildFile; fileRef = F3F7D8E72933074E00816151 /* SDL_begin_code.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		F3F7D9E22933074E00816151 /* SDL_begin_code.h in Headers */ = {isa = PBXBuildFile; fileRef = F3F7D8E72933074E00816151 /* SDL_begin_code.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		F3F7D9E32933074E00816151 /* SDL_begin_code.h in Headers */ = {isa = PBXBuildFile; fileRef = F3F7D8E72933074E00816151 /* SDL_begin_code.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		F3F7D9E42933074E00816151 /* SDL_begin_code.h in Headers */ = {isa = PBXBuildFile; fileRef = F3F7D8E72933074E00816151 /* SDL_begin_code.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		F3F7D9E52933074E00816151 /* SDL_system.h in Headers */ = {isa = PBXBuildFile; fileRef = F3F7D8E82933074E00816151 /* SDL_system.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		F3F7D9E62933074E00816151 /* SDL_system.h in Headers */ = {isa = PBXBuildFile; fileRef = F3F7D8E82933074E00816151 /* SDL_system.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		F3F7D9E72933074E00816151 /* SDL_system.h in Headers */ = {isa = PBXBuildFile; fileRef = F3F7D8E82933074E00816151 /* SDL_system.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -3966,9 +3966,9 @@
 		F3F7D8E22933074D00816151 /* SDL_rect.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_rect.h; path = SDL3/SDL_rect.h; sourceTree = "<group>"; };
 		F3F7D8E32933074D00816151 /* SDL_copying.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_copying.h; path = SDL3/SDL_copying.h; sourceTree = "<group>"; };
 		F3F7D8E42933074D00816151 /* SDL_version.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_version.h; path = SDL3/SDL_version.h; sourceTree = "<group>"; };
-		F3F7D8E52933074D00816151 /* close_code.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = close_code.h; path = SDL3/close_code.h; sourceTree = "<group>"; };
+		F3F7D8E52933074D00816151 /* SDL_close_code.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_close_code.h; path = SDL3/SDL_close_code.h; sourceTree = "<group>"; };
 		F3F7D8E62933074E00816151 /* SDL_mutex.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_mutex.h; path = SDL3/SDL_mutex.h; sourceTree = "<group>"; };
-		F3F7D8E72933074E00816151 /* begin_code.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = begin_code.h; path = SDL3/begin_code.h; sourceTree = "<group>"; };
+		F3F7D8E72933074E00816151 /* SDL_begin_code.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_begin_code.h; path = SDL3/SDL_begin_code.h; sourceTree = "<group>"; };
 		F3F7D8E82933074E00816151 /* SDL_system.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_system.h; path = SDL3/SDL_system.h; sourceTree = "<group>"; };
 		F59C710300D5CB5801000001 /* ReadMe.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = ReadMe.txt; sourceTree = "<group>"; };
 		F59C710600D5CB5801000001 /* SDL.info */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = SDL.info; sourceTree = "<group>"; };
@@ -4133,8 +4133,8 @@
 		0153844A006D81B07F000001 /* Public Headers */ = {
 			isa = PBXGroup;
 			children = (
-				F3F7D8E72933074E00816151 /* begin_code.h */,
-				F3F7D8E52933074D00816151 /* close_code.h */,
+				F3F7D8E72933074E00816151 /* SDL_begin_code.h */,
+				F3F7D8E52933074D00816151 /* SDL_close_code.h */,
 				F3F7D8E02933074D00816151 /* SDL_assert.h */,
 				F3F7D8B92933074A00816151 /* SDL_atomic.h */,
 				F3F7D8AA2933074900816151 /* SDL_audio.h */,
@@ -5858,9 +5858,9 @@
 				A7D8BBAC23E2514500DCD162 /* SDL_windowevents_c.h in Headers */,
 				A7D8B3B123E2514200DCD162 /* SDL_yuv_c.h in Headers */,
 				A7D8B9CC23E2514400DCD162 /* SDL_yuv_sw_c.h in Headers */,
-				F3F7D9E22933074E00816151 /* begin_code.h in Headers */,
+				F3F7D9E22933074E00816151 /* SDL_begin_code.h in Headers */,
 				A7D8BB4623E2514500DCD162 /* blank_cursor.h in Headers */,
-				F3F7D9DA2933074E00816151 /* close_code.h in Headers */,
+				F3F7D9DA2933074E00816151 /* SDL_close_code.h in Headers */,
 				A7D8B5B823E2514300DCD162 /* controller_type.h in Headers */,
 				A7D8BB4C23E2514500DCD162 /* default_cursor.h in Headers */,
 				A7D8B23D23E2514200DCD162 /* egl.h in Headers */,
@@ -6086,9 +6086,9 @@
 				A7D8BBAD23E2514500DCD162 /* SDL_windowevents_c.h in Headers */,
 				A7D8B3B223E2514200DCD162 /* SDL_yuv_c.h in Headers */,
 				A7D8B9CD23E2514400DCD162 /* SDL_yuv_sw_c.h in Headers */,
-				F3F7D9E32933074E00816151 /* begin_code.h in Headers */,
+				F3F7D9E32933074E00816151 /* SDL_begin_code.h in Headers */,
 				A7D8BB4723E2514500DCD162 /* blank_cursor.h in Headers */,
-				F3F7D9DB2933074E00816151 /* close_code.h in Headers */,
+				F3F7D9DB2933074E00816151 /* SDL_close_code.h in Headers */,
 				A7D8B5B923E2514300DCD162 /* controller_type.h in Headers */,
 				A7D8BB4D23E2514500DCD162 /* default_cursor.h in Headers */,
 				A7D8B23E23E2514200DCD162 /* egl.h in Headers */,
@@ -6479,9 +6479,9 @@
 				A7D8BBAB23E2514500DCD162 /* SDL_windowevents_c.h in Headers */,
 				A7D8B3B023E2514200DCD162 /* SDL_yuv_c.h in Headers */,
 				A7D8B9CB23E2514400DCD162 /* SDL_yuv_sw_c.h in Headers */,
-				F3F7D9E12933074E00816151 /* begin_code.h in Headers */,
+				F3F7D9E12933074E00816151 /* SDL_begin_code.h in Headers */,
 				A7D8BB4523E2514500DCD162 /* blank_cursor.h in Headers */,
-				F3F7D9D92933074E00816151 /* close_code.h in Headers */,
+				F3F7D9D92933074E00816151 /* SDL_close_code.h in Headers */,
 				A7D8B5B723E2514300DCD162 /* controller_type.h in Headers */,
 				A7D8BB4B23E2514500DCD162 /* default_cursor.h in Headers */,
 				A7D8B23C23E2514200DCD162 /* egl.h in Headers */,
@@ -6920,8 +6920,8 @@
 				F3F7D9D82933074E00816151 /* SDL_version.h in Headers */,
 				F3F7D95C2933074E00816151 /* SDL_video.h in Headers */,
 				F3F7D9982933074E00816151 /* SDL_vulkan.h in Headers */,
-				F3F7D9E42933074E00816151 /* begin_code.h in Headers */,
-				F3F7D9DC2933074E00816151 /* close_code.h in Headers */,
+				F3F7D9E42933074E00816151 /* SDL_begin_code.h in Headers */,
+				F3F7D9DC2933074E00816151 /* SDL_close_code.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

+ 3 - 0
docs/README-migration.md

@@ -29,6 +29,9 @@ The SDL3test library has been renamed SDL3_test.
 There is no static SDLmain library anymore, it's now header-only, see below in the SDL_main.h section.
 
 
+begin_code.h and close_code.h in the public headers have been renamed to SDL_begin_code.h and SDL_close_code.h. These aren't meant to be included directly by applications, but if your application did, please update your `#include` lines.
+
+
 ## SDL_cpuinfo.h
 
 The following headers are no longer automatically included, and will need to be included manually:

+ 2 - 2
include/SDL3/SDL_assert.h

@@ -24,7 +24,7 @@
 
 #include <SDL3/SDL_stdinc.h>
 
-#include <SDL3/begin_code.h>
+#include <SDL3/SDL_begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -313,7 +313,7 @@ extern DECLSPEC void SDLCALL SDL_ResetAssertionReport(void);
 #ifdef __cplusplus
 }
 #endif
-#include <SDL3/close_code.h>
+#include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_assert_h_ */
 

+ 2 - 2
include/SDL3/SDL_atomic.h

@@ -62,7 +62,7 @@
 #include <SDL3/SDL_stdinc.h>
 #include <SDL3/SDL_platform.h>
 
-#include <SDL3/begin_code.h>
+#include <SDL3/SDL_begin_code.h>
 
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
@@ -403,7 +403,7 @@ extern DECLSPEC void* SDLCALL SDL_AtomicGetPtr(void **a);
 }
 #endif
 
-#include <SDL3/close_code.h>
+#include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_atomic_h_ */
 

+ 2 - 2
include/SDL3/SDL_audio.h

@@ -37,7 +37,7 @@
 #include <SDL3/SDL_thread.h>
 #include <SDL3/SDL_rwops.h>
 
-#include <SDL3/begin_code.h>
+#include <SDL3/SDL_begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -1493,7 +1493,7 @@ extern DECLSPEC void SDLCALL SDL_CloseAudioDevice(SDL_AudioDeviceID dev);
 #ifdef __cplusplus
 }
 #endif
-#include <SDL3/close_code.h>
+#include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_audio_h_ */
 

+ 5 - 5
include/SDL3/begin_code.h → include/SDL3/SDL_begin_code.h

@@ -20,7 +20,7 @@
 */
 
 /**
- *  \file begin_code.h
+ *  \file SDL_begin_code.h
  *
  *  This file sets things up for C dynamic library function definitions,
  *  static inlined functions, and structures aligned at 4-byte alignment.
@@ -28,10 +28,10 @@
  */
 
 /* This shouldn't be nested -- included it around code only. */
-#ifdef _begin_code_h
-#error Nested inclusion of begin_code.h
+#ifdef _SDL_begin_code_h
+#error Nested inclusion of SDL_begin_code.h
 #endif
-#define _begin_code_h
+#define _SDL_begin_code_h
 
 #ifndef SDL_DEPRECATED
 #  if defined(__GNUC__) && (__GNUC__ >= 4)  /* technically, this arrived in gcc 3.1, but oh well. */
@@ -78,7 +78,7 @@
 /* Force structure packing at 4 byte alignment.
    This is necessary if the header is included in code which has structure
    packing set to an alternate value, say for loading structures from disk.
-   The packing is reset to the previous value in close_code.h
+   The packing is reset to the previous value in SDL_close_code.h
  */
 #if defined(_MSC_VER) || defined(__MWERKS__) || defined(__BORLANDC__)
 #ifdef _MSC_VER

+ 2 - 2
include/SDL3/SDL_bits.h

@@ -30,7 +30,7 @@
 
 #include <SDL3/SDL_stdinc.h>
 
-#include <SDL3/begin_code.h>
+#include <SDL3/SDL_begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -119,7 +119,7 @@ SDL_HasExactlyOneBitSet32(Uint32 x)
 #ifdef __cplusplus
 }
 #endif
-#include <SDL3/close_code.h>
+#include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_bits_h_ */
 

+ 2 - 2
include/SDL3/SDL_blendmode.h

@@ -28,7 +28,7 @@
 #ifndef SDL_blendmode_h_
 #define SDL_blendmode_h_
 
-#include <SDL3/begin_code.h>
+#include <SDL3/SDL_begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -191,7 +191,7 @@ extern DECLSPEC SDL_BlendMode SDLCALL SDL_ComposeCustomBlendMode(SDL_BlendFactor
 #ifdef __cplusplus
 }
 #endif
-#include <SDL3/close_code.h>
+#include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_blendmode_h_ */
 

+ 2 - 2
include/SDL3/SDL_clipboard.h

@@ -30,7 +30,7 @@
 
 #include <SDL3/SDL_stdinc.h>
 
-#include <SDL3/begin_code.h>
+#include <SDL3/SDL_begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -134,7 +134,7 @@ extern DECLSPEC SDL_bool SDLCALL SDL_HasPrimarySelectionText(void);
 #ifdef __cplusplus
 }
 #endif
-#include <SDL3/close_code.h>
+#include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_clipboard_h_ */
 

+ 5 - 5
include/SDL3/close_code.h → include/SDL3/SDL_close_code.h

@@ -20,16 +20,16 @@
 */
 
 /**
- *  \file close_code.h
+ *  \file SDL_close_code.h
  *
- *  This file reverses the effects of begin_code.h and should be included
+ *  This file reverses the effects of SDL_begin_code.h and should be included
  *  after you finish any function and structure declarations in your headers
  */
 
-#ifndef _begin_code_h
-#error close_code.h included without matching begin_code.h
+#ifndef _SDL_begin_code_h
+#error SDL_close_code.h included without matching SDL_begin_code.h
 #endif
-#undef _begin_code_h
+#undef _SDL_begin_code_h
 
 /* Reset structure packing at previous byte alignment */
 #if defined(_MSC_VER) || defined(__MWERKS__) || defined(__BORLANDC__)

+ 2 - 2
include/SDL3/SDL_cpuinfo.h

@@ -30,7 +30,7 @@
 
 #include <SDL3/SDL_stdinc.h>
 
-#include <SDL3/begin_code.h>
+#include <SDL3/SDL_begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -493,7 +493,7 @@ extern DECLSPEC void SDLCALL SDL_SIMDFree(void *ptr);
 #ifdef __cplusplus
 }
 #endif
-#include <SDL3/close_code.h>
+#include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_cpuinfo_h_ */
 

+ 2 - 2
include/SDL3/SDL_endian.h

@@ -110,7 +110,7 @@ _m_prefetch(void *__P)
 #endif /* !SDL_FLOATWORDORDER */
 
 
-#include <SDL3/begin_code.h>
+#include <SDL3/SDL_begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -341,7 +341,7 @@ SDL_SwapFloat(float x)
 #ifdef __cplusplus
 }
 #endif
-#include <SDL3/close_code.h>
+#include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_endian_h_ */
 

+ 2 - 2
include/SDL3/SDL_error.h

@@ -30,7 +30,7 @@
 
 #include <SDL3/SDL_stdinc.h>
 
-#include <SDL3/begin_code.h>
+#include <SDL3/SDL_begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -156,7 +156,7 @@ extern DECLSPEC int SDLCALL SDL_Error(SDL_errorcode code);
 #ifdef __cplusplus
 }
 #endif
-#include <SDL3/close_code.h>
+#include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_error_h_ */
 

+ 2 - 2
include/SDL3/SDL_events.h

@@ -38,7 +38,7 @@
 #include <SDL3/SDL_quit.h>
 #include <SDL3/SDL_touch.h>
 
-#include <SDL3/begin_code.h>
+#include <SDL3/SDL_begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -1143,7 +1143,7 @@ extern DECLSPEC Uint32 SDLCALL SDL_RegisterEvents(int numevents);
 #ifdef __cplusplus
 }
 #endif
-#include <SDL3/close_code.h>
+#include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_events_h_ */
 

+ 2 - 2
include/SDL3/SDL_filesystem.h

@@ -30,7 +30,7 @@
 
 #include <SDL3/SDL_stdinc.h>
 
-#include <SDL3/begin_code.h>
+#include <SDL3/SDL_begin_code.h>
 
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
@@ -142,7 +142,7 @@ extern DECLSPEC char *SDLCALL SDL_GetPrefPath(const char *org, const char *app);
 #ifdef __cplusplus
 }
 #endif
-#include <SDL3/close_code.h>
+#include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_filesystem_h_ */
 

+ 2 - 2
include/SDL3/SDL_gamecontroller.h

@@ -34,7 +34,7 @@
 #include <SDL3/SDL_sensor.h>
 #include <SDL3/SDL_joystick.h>
 
-#include <SDL3/begin_code.h>
+#include <SDL3/SDL_begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -1048,7 +1048,7 @@ extern DECLSPEC const char* SDLCALL SDL_GameControllerGetAppleSFSymbolsNameForAx
 #ifdef __cplusplus
 }
 #endif
-#include <SDL3/close_code.h>
+#include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_gamecontroller_h_ */
 

+ 2 - 2
include/SDL3/SDL_guid.h

@@ -31,7 +31,7 @@
 #include <SDL3/SDL_stdinc.h>
 #include <SDL3/SDL_error.h>
 
-#include <SDL3/begin_code.h>
+#include <SDL3/SDL_begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -93,7 +93,7 @@ extern DECLSPEC SDL_GUID SDLCALL SDL_GUIDFromString(const char *pchGUID);
 #ifdef __cplusplus
 }
 #endif
-#include <SDL3/close_code.h>
+#include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_guid_h_ */
 

+ 2 - 2
include/SDL3/SDL_haptic.h

@@ -111,7 +111,7 @@
 #include <SDL3/SDL_error.h>
 #include <SDL3/SDL_joystick.h>
 
-#include <SDL3/begin_code.h>
+#include <SDL3/SDL_begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -1334,7 +1334,7 @@ extern DECLSPEC int SDLCALL SDL_HapticRumbleStop(SDL_Haptic * haptic);
 #ifdef __cplusplus
 }
 #endif
-#include <SDL3/close_code.h>
+#include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_haptic_h_ */
 

+ 2 - 2
include/SDL3/SDL_hidapi.h

@@ -64,7 +64,7 @@
 
 #include <SDL3/SDL_stdinc.h>
 
-#include <SDL3/begin_code.h>
+#include <SDL3/SDL_begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -444,7 +444,7 @@ extern DECLSPEC void SDLCALL SDL_hid_ble_scan(SDL_bool active);
 #ifdef __cplusplus
 }
 #endif
-#include <SDL3/close_code.h>
+#include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_hidapi_h_ */
 

+ 2 - 2
include/SDL3/SDL_hints.h

@@ -41,7 +41,7 @@
 
 #include <SDL3/SDL_stdinc.h>
 
-#include <SDL3/begin_code.h>
+#include <SDL3/SDL_begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -2549,7 +2549,7 @@ extern DECLSPEC void SDLCALL SDL_ClearHints(void);
 #ifdef __cplusplus
 }
 #endif
-#include <SDL3/close_code.h>
+#include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_hints_h_ */
 

+ 2 - 2
include/SDL3/SDL_init.h

@@ -30,7 +30,7 @@
 
 #include <SDL3/SDL_stdinc.h>
 
-#include <SDL3/begin_code.h>
+#include <SDL3/SDL_begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -192,7 +192,7 @@ extern DECLSPEC void SDLCALL SDL_Quit(void);
 #ifdef __cplusplus
 }
 #endif
-#include <SDL3/close_code.h>
+#include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_init_h_ */
 

+ 2 - 2
include/SDL3/SDL_joystick.h

@@ -46,7 +46,7 @@
 #include <SDL3/SDL_guid.h>
 #include <SDL3/SDL_mutex.h>
 
-#include <SDL3/begin_code.h>
+#include <SDL3/SDL_begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -1023,7 +1023,7 @@ extern DECLSPEC SDL_JoystickPowerLevel SDLCALL SDL_JoystickCurrentPowerLevel(SDL
 #ifdef __cplusplus
 }
 #endif
-#include <SDL3/close_code.h>
+#include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_joystick_h_ */
 

+ 2 - 2
include/SDL3/SDL_keyboard.h

@@ -33,7 +33,7 @@
 #include <SDL3/SDL_keycode.h>
 #include <SDL3/SDL_video.h>
 
-#include <SDL3/begin_code.h>
+#include <SDL3/SDL_begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -346,7 +346,7 @@ extern DECLSPEC SDL_bool SDLCALL SDL_IsScreenKeyboardShown(SDL_Window *window);
 #ifdef __cplusplus
 }
 #endif
-#include <SDL3/close_code.h>
+#include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_keyboard_h_ */
 

+ 2 - 2
include/SDL3/SDL_loadso.h

@@ -44,7 +44,7 @@
 #include <SDL3/SDL_stdinc.h>
 #include <SDL3/SDL_error.h>
 
-#include <SDL3/begin_code.h>
+#include <SDL3/SDL_begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -108,7 +108,7 @@ extern DECLSPEC void SDLCALL SDL_UnloadObject(void *handle);
 #ifdef __cplusplus
 }
 #endif
-#include <SDL3/close_code.h>
+#include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_loadso_h_ */
 

+ 2 - 2
include/SDL3/SDL_locale.h

@@ -31,7 +31,7 @@
 #include <SDL3/SDL_stdinc.h>
 #include <SDL3/SDL_error.h>
 
-#include <SDL3/begin_code.h>
+#include <SDL3/SDL_begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 /* *INDENT-OFF* */
@@ -96,7 +96,7 @@ extern DECLSPEC SDL_Locale * SDLCALL SDL_GetPreferredLocales(void);
 }
 /* *INDENT-ON* */
 #endif
-#include <SDL3/close_code.h>
+#include <SDL3/SDL_close_code.h>
 
 #endif /* _SDL_locale_h */
 

+ 2 - 2
include/SDL3/SDL_log.h

@@ -39,7 +39,7 @@
 
 #include <SDL3/SDL_stdinc.h>
 
-#include <SDL3/begin_code.h>
+#include <SDL3/SDL_begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -397,7 +397,7 @@ extern DECLSPEC void SDLCALL SDL_LogSetOutputFunction(SDL_LogOutputFunction call
 #ifdef __cplusplus
 }
 #endif
-#include <SDL3/close_code.h>
+#include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_log_h_ */
 

+ 2 - 2
include/SDL3/SDL_main.h

@@ -144,7 +144,7 @@
 #define main    SDL_main
 #endif
 
-#include <SDL3/begin_code.h>
+#include <SDL3/SDL_begin_code.h>
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -275,7 +275,7 @@ extern DECLSPEC void SDLCALL SDL_GDKSuspendComplete(void);
 }
 #endif
 
-#include <SDL3/close_code.h>
+#include <SDL3/SDL_close_code.h>
 
 #if !defined(SDL_MAIN_HANDLED) && !defined(SDL_MAIN_NOIMPL)
 /* include header-only SDL_main implementations */

+ 4 - 4
include/SDL3/SDL_main_impl.h

@@ -48,7 +48,7 @@
 #define WINAPI __stdcall
 #endif
 
-#include <SDL3/begin_code.h>
+#include <SDL3/SDL_begin_code.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -98,7 +98,7 @@ WinMain(HINSTANCE hInst, HINSTANCE hPrev, LPSTR szCmdLine, int sw)
 } /* extern "C" */
 #endif
 
-#include <SDL3/close_code.h>
+#include <SDL3/SDL_close_code.h>
 
 /* end of __WIN32__ and __GDK__ impls */
 #elif defined(__WINRT__)
@@ -171,7 +171,7 @@ TInt E32Main()
 
 #else /* platforms that use a standard main() and just call SDL_RunApp(), like iOS and 3DS */
 
-#include <SDL3/begin_code.h>
+#include <SDL3/SDL_begin_code.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -186,7 +186,7 @@ int main(int argc, char *argv[])
 } /* extern "C" */
 #endif
 
-#include <SDL3/close_code.h>
+#include <SDL3/SDL_close_code.h>
 
 /* end of impls for standard-conforming platforms */
 

+ 2 - 2
include/SDL3/SDL_messagebox.h

@@ -25,7 +25,7 @@
 #include <SDL3/SDL_stdinc.h>
 #include <SDL3/SDL_video.h>      /* For SDL_Window */
 
-#include <SDL3/begin_code.h>
+#include <SDL3/SDL_begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -186,7 +186,7 @@ extern DECLSPEC int SDLCALL SDL_ShowSimpleMessageBox(Uint32 flags, const char *t
 #ifdef __cplusplus
 }
 #endif
-#include <SDL3/close_code.h>
+#include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_messagebox_h_ */
 

+ 2 - 2
include/SDL3/SDL_metal.h

@@ -30,7 +30,7 @@
 
 #include <SDL3/SDL_video.h>
 
-#include <SDL3/begin_code.h>
+#include <SDL3/SDL_begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -108,6 +108,6 @@ extern DECLSPEC void SDLCALL SDL_Metal_GetDrawableSize(SDL_Window* window, int *
 #ifdef __cplusplus
 }
 #endif
-#include <SDL3/close_code.h>
+#include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_metal_h_ */

+ 2 - 2
include/SDL3/SDL_misc.h

@@ -30,7 +30,7 @@
 
 #include <SDL3/SDL_stdinc.h>
 
-#include <SDL3/begin_code.h>
+#include <SDL3/SDL_begin_code.h>
 
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
@@ -72,7 +72,7 @@ extern DECLSPEC int SDLCALL SDL_OpenURL(const char *url);
 #ifdef __cplusplus
 }
 #endif
-#include <SDL3/close_code.h>
+#include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_misc_h_ */
 

+ 2 - 2
include/SDL3/SDL_mouse.h

@@ -32,7 +32,7 @@
 #include <SDL3/SDL_error.h>
 #include <SDL3/SDL_video.h>
 
-#include <SDL3/begin_code.h>
+#include <SDL3/SDL_begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -463,7 +463,7 @@ extern DECLSPEC int SDLCALL SDL_ShowCursor(int toggle);
 #ifdef __cplusplus
 }
 #endif
-#include <SDL3/close_code.h>
+#include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_mouse_h_ */
 

+ 2 - 2
include/SDL3/SDL_mutex.h

@@ -105,7 +105,7 @@
 /******************************************************************************/
 
 
-#include <SDL3/begin_code.h>
+#include <SDL3/SDL_begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -538,7 +538,7 @@ extern DECLSPEC int SDLCALL SDL_CondWaitTimeout(SDL_cond *cond,
 #ifdef __cplusplus
 }
 #endif
-#include <SDL3/close_code.h>
+#include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_mutex_h_ */
 

+ 2 - 2
include/SDL3/SDL_pixels.h

@@ -31,7 +31,7 @@
 #include <SDL3/SDL_stdinc.h>
 #include <SDL3/SDL_endian.h>
 
-#include <SDL3/begin_code.h>
+#include <SDL3/SDL_begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -614,7 +614,7 @@ extern DECLSPEC void SDLCALL SDL_GetRGBA(Uint32 pixel,
 #ifdef __cplusplus
 }
 #endif
-#include <SDL3/close_code.h>
+#include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_pixels_h_ */
 

+ 2 - 2
include/SDL3/SDL_platform.h

@@ -207,7 +207,7 @@
 #define __3DS__ 1
 #endif
 
-#include <SDL3/begin_code.h>
+#include <SDL3/SDL_begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -235,7 +235,7 @@ extern DECLSPEC const char * SDLCALL SDL_GetPlatform (void);
 #ifdef __cplusplus
 }
 #endif
-#include <SDL3/close_code.h>
+#include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_platform_h_ */
 

+ 2 - 2
include/SDL3/SDL_power.h

@@ -30,7 +30,7 @@
 
 #include <SDL3/SDL_stdinc.h>
 
-#include <SDL3/begin_code.h>
+#include <SDL3/SDL_begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -80,7 +80,7 @@ extern DECLSPEC SDL_PowerState SDLCALL SDL_GetPowerInfo(int *seconds, int *perce
 #ifdef __cplusplus
 }
 #endif
-#include <SDL3/close_code.h>
+#include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_power_h_ */
 

+ 2 - 2
include/SDL3/SDL_rect.h

@@ -33,7 +33,7 @@
 #include <SDL3/SDL_pixels.h>
 #include <SDL3/SDL_rwops.h>
 
-#include <SDL3/begin_code.h>
+#include <SDL3/SDL_begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -369,7 +369,7 @@ extern DECLSPEC SDL_bool SDLCALL SDL_IntersectFRectAndLine(const SDL_FRect *
 #ifdef __cplusplus
 }
 #endif
-#include <SDL3/close_code.h>
+#include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_rect_h_ */
 

+ 2 - 2
include/SDL3/SDL_render.h

@@ -52,7 +52,7 @@
 #include <SDL3/SDL_rect.h>
 #include <SDL3/SDL_video.h>
 
-#include <SDL3/begin_code.h>
+#include <SDL3/SDL_begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -1929,7 +1929,7 @@ extern DECLSPEC int SDLCALL SDL_RenderSetVSync(SDL_Renderer* renderer, int vsync
 #ifdef __cplusplus
 }
 #endif
-#include <SDL3/close_code.h>
+#include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_render_h_ */
 

+ 2 - 2
include/SDL3/SDL_rwops.h

@@ -32,7 +32,7 @@
 #include <SDL3/SDL_stdinc.h>
 #include <SDL3/SDL_error.h>
 
-#include <SDL3/begin_code.h>
+#include <SDL3/SDL_begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -805,7 +805,7 @@ extern DECLSPEC size_t SDLCALL SDL_WriteBE64(SDL_RWops * dst, Uint64 value);
 #ifdef __cplusplus
 }
 #endif
-#include <SDL3/close_code.h>
+#include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_rwops_h_ */
 

+ 2 - 2
include/SDL3/SDL_sensor.h

@@ -32,7 +32,7 @@
 #include <SDL3/SDL_stdinc.h>
 #include <SDL3/SDL_error.h>
 
-#include <SDL3/begin_code.h>
+#include <SDL3/SDL_begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 /* *INDENT-OFF* */
@@ -298,7 +298,7 @@ extern DECLSPEC void SDLCALL SDL_SensorUpdate(void);
 }
 /* *INDENT-ON* */
 #endif
-#include <SDL3/close_code.h>
+#include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_sensor_h_ */
 

+ 2 - 2
include/SDL3/SDL_shape.h

@@ -28,7 +28,7 @@
 #include <SDL3/SDL_surface.h>
 #include <SDL3/SDL_video.h>
 
-#include <SDL3/begin_code.h>
+#include <SDL3/SDL_begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -150,6 +150,6 @@ extern DECLSPEC int SDLCALL SDL_GetShapedWindowMode(SDL_Window *window,SDL_Windo
 #ifdef __cplusplus
 }
 #endif
-#include <SDL3/close_code.h>
+#include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_shape_h_ */

+ 2 - 2
include/SDL3/SDL_stdinc.h

@@ -367,7 +367,7 @@ SDL_COMPILE_TIME_ASSERT(enum, sizeof(SDL_DUMMY_ENUM) == sizeof(int));
 #endif /* DOXYGEN_SHOULD_IGNORE_THIS */
 /** \endcond */
 
-#include <SDL3/begin_code.h>
+#include <SDL3/SDL_begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -740,7 +740,7 @@ SDL_FORCE_INLINE int _SDL_size_add_overflow_builtin (size_t a,
 #ifdef __cplusplus
 }
 #endif
-#include <SDL3/close_code.h>
+#include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_stdinc_h_ */
 

+ 2 - 2
include/SDL3/SDL_surface.h

@@ -34,7 +34,7 @@
 #include <SDL3/SDL_blendmode.h>
 #include <SDL3/SDL_rwops.h>
 
-#include <SDL3/begin_code.h>
+#include <SDL3/SDL_begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -882,7 +882,7 @@ extern DECLSPEC SDL_YUV_CONVERSION_MODE SDLCALL SDL_GetYUVConversionModeForResol
 #ifdef __cplusplus
 }
 #endif
-#include <SDL3/close_code.h>
+#include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_surface_h_ */
 

+ 2 - 2
include/SDL3/SDL_system.h

@@ -33,7 +33,7 @@
 #include <SDL3/SDL_render.h>
 #include <SDL3/SDL_video.h>
 
-#include <SDL3/begin_code.h>
+#include <SDL3/SDL_begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -616,7 +616,7 @@ extern DECLSPEC int SDLCALL SDL_GDKGetTaskQueue(XTaskQueueHandle * outTaskQueue)
 #ifdef __cplusplus
 }
 #endif
-#include <SDL3/close_code.h>
+#include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_system_h_ */
 

+ 2 - 2
include/SDL3/SDL_syswm.h

@@ -57,7 +57,7 @@
  */
 struct SDL_SysWMinfo;
 
-#include <SDL3/begin_code.h>
+#include <SDL3/SDL_begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -261,7 +261,7 @@ extern DECLSPEC int SDLCALL SDL_GetWindowWMInfo(SDL_Window *window, SDL_SysWMinf
 #ifdef __cplusplus
 }
 #endif
-#include <SDL3/close_code.h>
+#include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_syswm_h_ */
 

+ 2 - 2
include/SDL3/SDL_test.h

@@ -44,7 +44,7 @@
 #include <SDL3/SDL_test_memory.h>
 #include <SDL3/SDL_test_random.h>
 
-#include <SDL3/begin_code.h>
+#include <SDL3/SDL_begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -62,7 +62,7 @@ extern "C" {
 #ifdef __cplusplus
 }
 #endif
-#include <SDL3/close_code.h>
+#include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_test_h_ */
 

+ 2 - 2
include/SDL3/SDL_test_assert.h

@@ -36,7 +36,7 @@
 #ifndef SDL_test_assert_h_
 #define SDL_test_assert_h_
 
-#include <SDL3/begin_code.h>
+#include <SDL3/SDL_begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -98,7 +98,7 @@ int SDLTest_AssertSummaryToTestResult(void);
 #ifdef __cplusplus
 }
 #endif
-#include <SDL3/close_code.h>
+#include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_test_assert_h_ */
 

+ 2 - 2
include/SDL3/SDL_test_common.h

@@ -121,7 +121,7 @@ typedef struct
 
 } SDLTest_CommonState;
 
-#include <SDL3/begin_code.h>
+#include <SDL3/SDL_begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -229,7 +229,7 @@ void SDLTest_CommonDrawWindowInfo(SDL_Renderer * renderer, SDL_Window * window,
 #ifdef __cplusplus
 }
 #endif
-#include <SDL3/close_code.h>
+#include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_test_common_h_ */
 

+ 2 - 2
include/SDL3/SDL_test_compare.h

@@ -40,7 +40,7 @@
 
 #include <SDL3/SDL_test_images.h>
 
-#include <SDL3/begin_code.h>
+#include <SDL3/SDL_begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -62,7 +62,7 @@ int SDLTest_CompareSurfaces(SDL_Surface *surface, SDL_Surface *referenceSurface,
 #ifdef __cplusplus
 }
 #endif
-#include <SDL3/close_code.h>
+#include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_test_compare_h_ */
 

+ 2 - 2
include/SDL3/SDL_test_crc32.h

@@ -36,7 +36,7 @@
 #ifndef SDL_test_crc32_h_
 #define SDL_test_crc32_h_
 
-#include <SDL3/begin_code.h>
+#include <SDL3/SDL_begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -117,7 +117,7 @@ int SDLTest_Crc32Done(SDLTest_Crc32Context * crcContext);
 #ifdef __cplusplus
 }
 #endif
-#include <SDL3/close_code.h>
+#include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_test_crc32_h_ */
 

+ 2 - 2
include/SDL3/SDL_test_font.h

@@ -30,7 +30,7 @@
 #ifndef SDL_test_font_h_
 #define SDL_test_font_h_
 
-#include <SDL3/begin_code.h>
+#include <SDL3/SDL_begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -161,7 +161,7 @@ void SDLTest_CleanupTextDrawing(void);
 #ifdef __cplusplus
 }
 #endif
-#include <SDL3/close_code.h>
+#include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_test_font_h_ */
 

+ 2 - 2
include/SDL3/SDL_test_fuzzer.h

@@ -36,7 +36,7 @@
 #ifndef SDL_test_fuzzer_h_
 #define SDL_test_fuzzer_h_
 
-#include <SDL3/begin_code.h>
+#include <SDL3/SDL_begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -379,7 +379,7 @@ int SDLTest_GetFuzzerInvocationCount(void);
 #ifdef __cplusplus
 }
 #endif
-#include <SDL3/close_code.h>
+#include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_test_fuzzer_h_ */
 

+ 2 - 2
include/SDL3/SDL_test_harness.h

@@ -36,7 +36,7 @@
 #ifndef SDL_test_h_arness_h
 #define SDL_test_h_arness_h
 
-#include <SDL3/begin_code.h>
+#include <SDL3/SDL_begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -127,7 +127,7 @@ int SDLTest_RunSuites(SDLTest_TestSuiteReference *testSuites[], const char *user
 #ifdef __cplusplus
 }
 #endif
-#include <SDL3/close_code.h>
+#include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_test_h_arness_h */
 

+ 2 - 2
include/SDL3/SDL_test_images.h

@@ -38,7 +38,7 @@
 
 #include <SDL3/SDL.h>
 
-#include <SDL3/begin_code.h>
+#include <SDL3/SDL_begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -71,7 +71,7 @@ SDL_Surface *SDLTest_ImagePrimitivesBlend(void);
 #ifdef __cplusplus
 }
 #endif
-#include <SDL3/close_code.h>
+#include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_test_images_h_ */
 

+ 2 - 2
include/SDL3/SDL_test_log.h

@@ -36,7 +36,7 @@
 #ifndef SDL_test_log_h_
 #define SDL_test_log_h_
 
-#include <SDL3/begin_code.h>
+#include <SDL3/SDL_begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -60,7 +60,7 @@ void SDLTest_LogError(SDL_PRINTF_FORMAT_STRING const char *fmt, ...) SDL_PRINTF_
 #ifdef __cplusplus
 }
 #endif
-#include <SDL3/close_code.h>
+#include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_test_log_h_ */
 

+ 2 - 2
include/SDL3/SDL_test_md5.h

@@ -56,7 +56,7 @@
 #ifndef SDL_test_md5_h_
 #define SDL_test_md5_h_
 
-#include <SDL3/begin_code.h>
+#include <SDL3/SDL_begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -122,7 +122,7 @@ extern "C" {
 #ifdef __cplusplus
 }
 #endif
-#include <SDL3/close_code.h>
+#include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_test_md5_h_ */
 

+ 2 - 2
include/SDL3/SDL_test_memory.h

@@ -30,7 +30,7 @@
 #ifndef SDL_test_memory_h_
 #define SDL_test_memory_h_
 
-#include <SDL3/begin_code.h>
+#include <SDL3/SDL_begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -56,7 +56,7 @@ void SDLTest_LogAllocations(void);
 #ifdef __cplusplus
 }
 #endif
-#include <SDL3/close_code.h>
+#include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_test_memory_h_ */
 

+ 2 - 2
include/SDL3/SDL_test_random.h

@@ -40,7 +40,7 @@
 #ifndef SDL_test_random_h_
 #define SDL_test_random_h_
 
-#include <SDL3/begin_code.h>
+#include <SDL3/SDL_begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -108,7 +108,7 @@ extern "C" {
 #ifdef __cplusplus
 }
 #endif
-#include <SDL3/close_code.h>
+#include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_test_random_h_ */
 

+ 2 - 2
include/SDL3/SDL_thread.h

@@ -39,7 +39,7 @@
 #include <process.h> /* _beginthreadex() and _endthreadex() */
 #endif
 
-#include <SDL3/begin_code.h>
+#include <SDL3/SDL_begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -414,7 +414,7 @@ extern DECLSPEC void SDLCALL SDL_TLSCleanup(void);
 #ifdef __cplusplus
 }
 #endif
-#include <SDL3/close_code.h>
+#include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_thread_h_ */
 

+ 2 - 2
include/SDL3/SDL_timer.h

@@ -31,7 +31,7 @@
 #include <SDL3/SDL_stdinc.h>
 #include <SDL3/SDL_error.h>
 
-#include <SDL3/begin_code.h>
+#include <SDL3/SDL_begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -193,7 +193,7 @@ extern DECLSPEC SDL_bool SDLCALL SDL_RemoveTimer(SDL_TimerID id);
 #ifdef __cplusplus
 }
 #endif
-#include <SDL3/close_code.h>
+#include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_timer_h_ */
 

+ 2 - 2
include/SDL3/SDL_touch.h

@@ -32,7 +32,7 @@
 #include <SDL3/SDL_error.h>
 #include <SDL3/SDL_video.h>
 
-#include <SDL3/begin_code.h>
+#include <SDL3/SDL_begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -141,7 +141,7 @@ extern DECLSPEC SDL_Finger * SDLCALL SDL_GetTouchFinger(SDL_TouchID touchID, int
 #ifdef __cplusplus
 }
 #endif
-#include <SDL3/close_code.h>
+#include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_touch_h_ */
 

+ 2 - 2
include/SDL3/SDL_version.h

@@ -30,7 +30,7 @@
 
 #include <SDL3/SDL_stdinc.h>
 
-#include <SDL3/begin_code.h>
+#include <SDL3/SDL_begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -156,7 +156,7 @@ extern DECLSPEC const char *SDLCALL SDL_GetRevision(void);
 #ifdef __cplusplus
 }
 #endif
-#include <SDL3/close_code.h>
+#include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_version_h_ */
 

+ 2 - 2
include/SDL3/SDL_video.h

@@ -33,7 +33,7 @@
 #include <SDL3/SDL_rect.h>
 #include <SDL3/SDL_surface.h>
 
-#include <SDL3/begin_code.h>
+#include <SDL3/SDL_begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -2080,7 +2080,7 @@ extern DECLSPEC void SDLCALL SDL_GL_DeleteContext(SDL_GLContext context);
 #ifdef __cplusplus
 }
 #endif
-#include <SDL3/close_code.h>
+#include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_video_h_ */
 

+ 2 - 2
include/SDL3/SDL_vulkan.h

@@ -30,7 +30,7 @@
 
 #include <SDL3/SDL_video.h>
 
-#include <SDL3/begin_code.h>
+#include <SDL3/SDL_begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -210,6 +210,6 @@ extern DECLSPEC void SDLCALL SDL_Vulkan_GetDrawableSize(SDL_Window * window,
 #ifdef __cplusplus
 }
 #endif
-#include <SDL3/close_code.h>
+#include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_vulkan_h_ */