From 18f38bef03d012f4369a869090716fd51d34bf02 Mon Sep 17 00:00:00 2001 From: Anonymous Maarten Date: Sat, 18 Feb 2023 18:36:06 +0100 Subject: [PATCH] Remove include/SDL3/SDL_name.h --- VisualC-GDK/SDL/SDL.vcxproj | 1 - VisualC-GDK/SDL/SDL.vcxproj.filters | 3 --- VisualC-WinRT/SDL-UWP.vcxproj | 1 - VisualC-WinRT/SDL-UWP.vcxproj.filters | 3 --- VisualC/SDL/SDL.vcxproj | 1 - VisualC/SDL/SDL.vcxproj.filters | 3 --- Xcode/SDL/SDL.xcodeproj/project.pbxproj | 8 ------- include/SDL3/SDL_name.h | 31 ------------------------- src/video/kmsdrm/SDL_kmsdrmdyn.c | 2 -- src/video/wayland/SDL_waylanddyn.c | 2 -- src/video/x11/SDL_x11dyn.c | 2 -- 11 files changed, 57 deletions(-) delete mode 100644 include/SDL3/SDL_name.h diff --git a/VisualC-GDK/SDL/SDL.vcxproj b/VisualC-GDK/SDL/SDL.vcxproj index 821b9b6f1..9bb1dd2f9 100644 --- a/VisualC-GDK/SDL/SDL.vcxproj +++ b/VisualC-GDK/SDL/SDL.vcxproj @@ -321,7 +321,6 @@ - diff --git a/VisualC-GDK/SDL/SDL.vcxproj.filters b/VisualC-GDK/SDL/SDL.vcxproj.filters index ef75396a2..9e7e0b72f 100644 --- a/VisualC-GDK/SDL/SDL.vcxproj.filters +++ b/VisualC-GDK/SDL/SDL.vcxproj.filters @@ -267,9 +267,6 @@ API Headers - - API Headers - API Headers diff --git a/VisualC-WinRT/SDL-UWP.vcxproj b/VisualC-WinRT/SDL-UWP.vcxproj index 0ca94fdc2..8fde0dadf 100644 --- a/VisualC-WinRT/SDL-UWP.vcxproj +++ b/VisualC-WinRT/SDL-UWP.vcxproj @@ -66,7 +66,6 @@ - diff --git a/VisualC-WinRT/SDL-UWP.vcxproj.filters b/VisualC-WinRT/SDL-UWP.vcxproj.filters index c6941033a..e51068b41 100644 --- a/VisualC-WinRT/SDL-UWP.vcxproj.filters +++ b/VisualC-WinRT/SDL-UWP.vcxproj.filters @@ -96,9 +96,6 @@ Header Files - - Header Files - Header Files diff --git a/VisualC/SDL/SDL.vcxproj b/VisualC/SDL/SDL.vcxproj index 2ea1875c2..55c4c72cd 100644 --- a/VisualC/SDL/SDL.vcxproj +++ b/VisualC/SDL/SDL.vcxproj @@ -267,7 +267,6 @@ - diff --git a/VisualC/SDL/SDL.vcxproj.filters b/VisualC/SDL/SDL.vcxproj.filters index 27420accc..3a2919fcc 100644 --- a/VisualC/SDL/SDL.vcxproj.filters +++ b/VisualC/SDL/SDL.vcxproj.filters @@ -264,9 +264,6 @@ API Headers - - API Headers - API Headers diff --git a/Xcode/SDL/SDL.xcodeproj/project.pbxproj b/Xcode/SDL/SDL.xcodeproj/project.pbxproj index ae548100f..1469fbec4 100644 --- a/Xcode/SDL/SDL.xcodeproj/project.pbxproj +++ b/Xcode/SDL/SDL.xcodeproj/project.pbxproj @@ -3384,9 +3384,6 @@ F3F7D9B12933074E00816151 /* SDL_power.h in Headers */ = {isa = PBXBuildFile; fileRef = F3F7D8DB2933074D00816151 /* SDL_power.h */; settings = {ATTRIBUTES = (Public, ); }; }; F3F7D9B22933074E00816151 /* SDL_power.h in Headers */ = {isa = PBXBuildFile; fileRef = F3F7D8DB2933074D00816151 /* SDL_power.h */; settings = {ATTRIBUTES = (Public, ); }; }; F3F7D9B32933074E00816151 /* SDL_power.h in Headers */ = {isa = PBXBuildFile; fileRef = F3F7D8DB2933074D00816151 /* SDL_power.h */; settings = {ATTRIBUTES = (Public, ); }; }; - F3F7D9B52933074E00816151 /* SDL_name.h in Headers */ = {isa = PBXBuildFile; fileRef = F3F7D8DC2933074D00816151 /* SDL_name.h */; settings = {ATTRIBUTES = (Public, ); }; }; - F3F7D9B62933074E00816151 /* SDL_name.h in Headers */ = {isa = PBXBuildFile; fileRef = F3F7D8DC2933074D00816151 /* SDL_name.h */; settings = {ATTRIBUTES = (Public, ); }; }; - F3F7D9B72933074E00816151 /* SDL_name.h in Headers */ = {isa = PBXBuildFile; fileRef = F3F7D8DC2933074D00816151 /* SDL_name.h */; settings = {ATTRIBUTES = (Public, ); }; }; F3F7D9B92933074E00816151 /* SDL_cpuinfo.h in Headers */ = {isa = PBXBuildFile; fileRef = F3F7D8DD2933074D00816151 /* SDL_cpuinfo.h */; settings = {ATTRIBUTES = (Public, ); }; }; F3F7D9BA2933074E00816151 /* SDL_cpuinfo.h in Headers */ = {isa = PBXBuildFile; fileRef = F3F7D8DD2933074D00816151 /* SDL_cpuinfo.h */; settings = {ATTRIBUTES = (Public, ); }; }; F3F7D9BB2933074E00816151 /* SDL_cpuinfo.h in Headers */ = {isa = PBXBuildFile; fileRef = F3F7D8DD2933074D00816151 /* SDL_cpuinfo.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -3924,7 +3921,6 @@ F3F7D8D92933074C00816151 /* SDL_loadso.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_loadso.h; path = SDL3/SDL_loadso.h; sourceTree = ""; }; F3F7D8DA2933074D00816151 /* SDL_mouse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_mouse.h; path = SDL3/SDL_mouse.h; sourceTree = ""; }; F3F7D8DB2933074D00816151 /* SDL_power.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_power.h; path = SDL3/SDL_power.h; sourceTree = ""; }; - F3F7D8DC2933074D00816151 /* SDL_name.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_name.h; path = SDL3/SDL_name.h; sourceTree = ""; }; F3F7D8DD2933074D00816151 /* SDL_cpuinfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_cpuinfo.h; path = SDL3/SDL_cpuinfo.h; sourceTree = ""; }; F3F7D8DE2933074D00816151 /* SDL_render.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_render.h; path = SDL3/SDL_render.h; sourceTree = ""; }; F3F7D8DF2933074D00816151 /* SDL_quit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_quit.h; path = SDL3/SDL_quit.h; sourceTree = ""; }; @@ -4129,7 +4125,6 @@ F3F7D8D52933074C00816151 /* SDL_misc.h */, F3F7D8DA2933074D00816151 /* SDL_mouse.h */, F3F7D8E62933074E00816151 /* SDL_mutex.h */, - F3F7D8DC2933074D00816151 /* SDL_name.h */, F3B38CCD296E2E52005DA6D3 /* SDL_oldnames.h */, F3F7D8E12933074D00816151 /* SDL_opengl.h */, F3F7D8C02933074A00816151 /* SDL_opengl_glext.h */, @@ -5737,7 +5732,6 @@ F3F7D9AE2933074E00816151 /* SDL_mouse.h in Headers */, A7D8BB1C23E2514500DCD162 /* SDL_mouse_c.h in Headers */, F3F7D9DE2933074E00816151 /* SDL_mutex.h in Headers */, - F3F7D9B62933074E00816151 /* SDL_name.h in Headers */, A7D8ABFE23E2514100DCD162 /* SDL_nullevents_c.h in Headers */, A7D8ABE623E2514100DCD162 /* SDL_nullframebuffer_c.h in Headers */, A7D8ABF823E2514100DCD162 /* SDL_nullvideo.h in Headers */, @@ -5970,7 +5964,6 @@ F3F7D9AF2933074E00816151 /* SDL_mouse.h in Headers */, A7D8BB1D23E2514500DCD162 /* SDL_mouse_c.h in Headers */, F3F7D9DF2933074E00816151 /* SDL_mutex.h in Headers */, - F3F7D9B72933074E00816151 /* SDL_name.h in Headers */, A7D8ABFF23E2514100DCD162 /* SDL_nullevents_c.h in Headers */, A7D8ABE723E2514100DCD162 /* SDL_nullframebuffer_c.h in Headers */, A7D8ABF923E2514100DCD162 /* SDL_nullvideo.h in Headers */, @@ -6368,7 +6361,6 @@ F3F7D9AD2933074E00816151 /* SDL_mouse.h in Headers */, A7D8BB1B23E2514500DCD162 /* SDL_mouse_c.h in Headers */, F3F7D9DD2933074E00816151 /* SDL_mutex.h in Headers */, - F3F7D9B52933074E00816151 /* SDL_name.h in Headers */, A7D8ABFD23E2514100DCD162 /* SDL_nullevents_c.h in Headers */, A7D8ABE523E2514100DCD162 /* SDL_nullframebuffer_c.h in Headers */, A7D8ABF723E2514100DCD162 /* SDL_nullvideo.h in Headers */, diff --git a/include/SDL3/SDL_name.h b/include/SDL3/SDL_name.h deleted file mode 100644 index 44a60d979..000000000 --- a/include/SDL3/SDL_name.h +++ /dev/null @@ -1,31 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2023 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -#ifndef SDLname_h_ -#define SDLname_h_ - -#if defined(__STDC__) || defined(__cplusplus) -#define NeedFunctionPrototypes 1 -#endif - -#define SDL_NAME(X) SDL_##X - -#endif /* SDLname_h_ */ diff --git a/src/video/kmsdrm/SDL_kmsdrmdyn.c b/src/video/kmsdrm/SDL_kmsdrmdyn.c index 9eca01215..d1f672db9 100644 --- a/src/video/kmsdrm/SDL_kmsdrmdyn.c +++ b/src/video/kmsdrm/SDL_kmsdrmdyn.c @@ -29,8 +29,6 @@ #ifdef SDL_VIDEO_DRIVER_KMSDRM_DYNAMIC -#include - typedef struct { void *lib; diff --git a/src/video/wayland/SDL_waylanddyn.c b/src/video/wayland/SDL_waylanddyn.c index a263a94f6..f9b63c24c 100644 --- a/src/video/wayland/SDL_waylanddyn.c +++ b/src/video/wayland/SDL_waylanddyn.c @@ -28,8 +28,6 @@ #ifdef SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC -#include - typedef struct { void *lib; diff --git a/src/video/x11/SDL_x11dyn.c b/src/video/x11/SDL_x11dyn.c index dfd4300f3..73d747f98 100644 --- a/src/video/x11/SDL_x11dyn.c +++ b/src/video/x11/SDL_x11dyn.c @@ -32,8 +32,6 @@ #ifdef SDL_VIDEO_DRIVER_X11_DYNAMIC -#include - typedef struct { void *lib;