From a27ecfe26c0d31765c7e15189054ee6f06c79c32 Mon Sep 17 00:00:00 2001 From: "Ryan C. Gordon" Date: Wed, 7 Aug 2013 11:12:11 -0700 Subject: [PATCH] SDL_*Parachute() are no-ops, remove them. --- Makefile.psp | 1 - VisualC/SDL/SDL_VS2008.vcproj | 8 ----- VisualC/SDL/SDL_VS2010.vcxproj | 2 -- VisualC/SDL/SDL_VS2012.vcxproj | 2 -- Xcode-iOS/SDL/SDL.xcodeproj/project.pbxproj | 6 ---- Xcode/SDL/SDL.xcodeproj/project.pbxproj | 16 --------- src/SDL.c | 6 ---- src/SDL_fatal.c | 36 --------------------- src/SDL_fatal.h | 27 ---------------- 9 files changed, 104 deletions(-) delete mode 100644 src/SDL_fatal.c delete mode 100644 src/SDL_fatal.h diff --git a/Makefile.psp b/Makefile.psp index ec137806d..8bcdcb927 100644 --- a/Makefile.psp +++ b/Makefile.psp @@ -2,7 +2,6 @@ TARGET_LIB = libSDL2.a OBJS= src/SDL.o \ src/SDL_assert.o \ src/SDL_error.o \ - src/SDL_fatal.o \ src/SDL_hints.o \ src/SDL_log.o \ src/atomic/SDL_atomic.o \ diff --git a/VisualC/SDL/SDL_VS2008.vcproj b/VisualC/SDL/SDL_VS2008.vcproj index 9481c6380..72eb2d4c9 100644 --- a/VisualC/SDL/SDL_VS2008.vcproj +++ b/VisualC/SDL/SDL_VS2008.vcproj @@ -864,14 +864,6 @@ RelativePath="..\..\src\events\SDL_events_c.h" > - - - - diff --git a/VisualC/SDL/SDL_VS2010.vcxproj b/VisualC/SDL/SDL_VS2010.vcxproj index 5d576b8b9..4fa9111d2 100644 --- a/VisualC/SDL/SDL_VS2010.vcxproj +++ b/VisualC/SDL/SDL_VS2010.vcxproj @@ -302,7 +302,6 @@ - @@ -406,7 +405,6 @@ - diff --git a/VisualC/SDL/SDL_VS2012.vcxproj b/VisualC/SDL/SDL_VS2012.vcxproj index 74e470051..213c10cef 100644 --- a/VisualC/SDL/SDL_VS2012.vcxproj +++ b/VisualC/SDL/SDL_VS2012.vcxproj @@ -306,7 +306,6 @@ - @@ -410,7 +409,6 @@ - diff --git a/Xcode-iOS/SDL/SDL.xcodeproj/project.pbxproj b/Xcode-iOS/SDL/SDL.xcodeproj/project.pbxproj index 08109d084..f3122ecba 100755 --- a/Xcode-iOS/SDL/SDL.xcodeproj/project.pbxproj +++ b/Xcode-iOS/SDL/SDL.xcodeproj/project.pbxproj @@ -159,7 +159,6 @@ FD6526750DE8FCDD002AD96B /* SDL_windowevents.c in Sources */ = {isa = PBXBuildFile; fileRef = FD99B99B0DD52EDC00FB1D6B /* SDL_windowevents.c */; }; FD6526760DE8FCDD002AD96B /* SDL_rwops.c in Sources */ = {isa = PBXBuildFile; fileRef = FD99B99E0DD52EDC00FB1D6B /* SDL_rwops.c */; }; FD6526780DE8FCDD002AD96B /* SDL_error.c in Sources */ = {isa = PBXBuildFile; fileRef = FD99B9D50DD52EDC00FB1D6B /* SDL_error.c */; }; - FD6526790DE8FCDD002AD96B /* SDL_fatal.c in Sources */ = {isa = PBXBuildFile; fileRef = FD99B9D60DD52EDC00FB1D6B /* SDL_fatal.c */; }; FD65267A0DE8FCDD002AD96B /* SDL.c in Sources */ = {isa = PBXBuildFile; fileRef = FD99B9D80DD52EDC00FB1D6B /* SDL.c */; }; FD65267B0DE8FCDD002AD96B /* SDL_syscond.c in Sources */ = {isa = PBXBuildFile; fileRef = FD99BA070DD52EDC00FB1D6B /* SDL_syscond.c */; }; FD65267C0DE8FCDD002AD96B /* SDL_sysmutex.c in Sources */ = {isa = PBXBuildFile; fileRef = FD99BA080DD52EDC00FB1D6B /* SDL_sysmutex.c */; }; @@ -386,8 +385,6 @@ FD99B99E0DD52EDC00FB1D6B /* SDL_rwops.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_rwops.c; sourceTree = ""; }; FD99B9D40DD52EDC00FB1D6B /* SDL_error_c.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_error_c.h; path = ../../src/SDL_error_c.h; sourceTree = ""; }; FD99B9D50DD52EDC00FB1D6B /* SDL_error.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SDL_error.c; path = ../../src/SDL_error.c; sourceTree = ""; }; - FD99B9D60DD52EDC00FB1D6B /* SDL_fatal.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SDL_fatal.c; path = ../../src/SDL_fatal.c; sourceTree = ""; }; - FD99B9D70DD52EDC00FB1D6B /* SDL_fatal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_fatal.h; path = ../../src/SDL_fatal.h; sourceTree = ""; }; FD99B9D80DD52EDC00FB1D6B /* SDL.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SDL.c; path = ../../src/SDL.c; sourceTree = ""; }; FD99BA070DD52EDC00FB1D6B /* SDL_syscond.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_syscond.c; sourceTree = ""; }; FD99BA080DD52EDC00FB1D6B /* SDL_sysmutex.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_sysmutex.c; sourceTree = ""; }; @@ -742,8 +739,6 @@ 04BAC09A1300C1290055DE28 /* SDL_assert_c.h */, FD99B9D40DD52EDC00FB1D6B /* SDL_error_c.h */, FD99B9D50DD52EDC00FB1D6B /* SDL_error.c */, - FD99B9D60DD52EDC00FB1D6B /* SDL_fatal.c */, - FD99B9D70DD52EDC00FB1D6B /* SDL_fatal.h */, 0442EC5412FE1C3F004C9285 /* SDL_hints.c */, 04BAC09B1300C1290055DE28 /* SDL_log.c */, FD99B9D80DD52EDC00FB1D6B /* SDL.c */, @@ -1112,7 +1107,6 @@ FD6526750DE8FCDD002AD96B /* SDL_windowevents.c in Sources */, FD6526760DE8FCDD002AD96B /* SDL_rwops.c in Sources */, FD6526780DE8FCDD002AD96B /* SDL_error.c in Sources */, - FD6526790DE8FCDD002AD96B /* SDL_fatal.c in Sources */, FD65267A0DE8FCDD002AD96B /* SDL.c in Sources */, FD65267B0DE8FCDD002AD96B /* SDL_syscond.c in Sources */, FD65267C0DE8FCDD002AD96B /* SDL_sysmutex.c in Sources */, diff --git a/Xcode/SDL/SDL.xcodeproj/project.pbxproj b/Xcode/SDL/SDL.xcodeproj/project.pbxproj index 245378d59..2fccf0f7c 100755 --- a/Xcode/SDL/SDL.xcodeproj/project.pbxproj +++ b/Xcode/SDL/SDL.xcodeproj/project.pbxproj @@ -113,8 +113,6 @@ 04BD009C12E6671800899322 /* SDL_assert.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFE5612E6671700899322 /* SDL_assert.c */; }; 04BD009E12E6671800899322 /* SDL_error_c.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFE5812E6671700899322 /* SDL_error_c.h */; }; 04BD009F12E6671800899322 /* SDL_error.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFE5912E6671700899322 /* SDL_error.c */; }; - 04BD00A012E6671800899322 /* SDL_fatal.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFE5A12E6671700899322 /* SDL_fatal.c */; }; - 04BD00A112E6671800899322 /* SDL_fatal.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFE5B12E6671700899322 /* SDL_fatal.h */; }; 04BD00A212E6671800899322 /* SDL.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFE5C12E6671700899322 /* SDL.c */; }; 04BD00A312E6671800899322 /* SDL_getenv.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFE5E12E6671700899322 /* SDL_getenv.c */; }; 04BD00A412E6671800899322 /* SDL_iconv.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFE5F12E6671700899322 /* SDL_iconv.c */; }; @@ -269,8 +267,6 @@ 04BD02B612E6671800899322 /* SDL_assert.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFE5612E6671700899322 /* SDL_assert.c */; }; 04BD02B812E6671800899322 /* SDL_error_c.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFE5812E6671700899322 /* SDL_error_c.h */; }; 04BD02B912E6671800899322 /* SDL_error.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFE5912E6671700899322 /* SDL_error.c */; }; - 04BD02BA12E6671800899322 /* SDL_fatal.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFE5A12E6671700899322 /* SDL_fatal.c */; }; - 04BD02BB12E6671800899322 /* SDL_fatal.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFE5B12E6671700899322 /* SDL_fatal.h */; }; 04BD02BC12E6671800899322 /* SDL.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFE5C12E6671700899322 /* SDL.c */; }; 04BD02BD12E6671800899322 /* SDL_getenv.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFE5E12E6671700899322 /* SDL_getenv.c */; }; 04BD02BE12E6671800899322 /* SDL_iconv.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFE5F12E6671700899322 /* SDL_iconv.c */; }; @@ -549,7 +545,6 @@ DB313F8E17554B71006C0E22 /* SDL_sysjoystick.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFE1812E6671700899322 /* SDL_sysjoystick.h */; }; DB313F8F17554B71006C0E22 /* SDL_assert_c.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFE5512E6671700899322 /* SDL_assert_c.h */; }; DB313F9017554B71006C0E22 /* SDL_error_c.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFE5812E6671700899322 /* SDL_error_c.h */; }; - DB313F9117554B71006C0E22 /* SDL_fatal.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFE5B12E6671700899322 /* SDL_fatal.h */; }; DB313F9217554B71006C0E22 /* SDL_sysmutex_c.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFE8012E6671800899322 /* SDL_sysmutex_c.h */; }; DB313F9317554B71006C0E22 /* SDL_systhread_c.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFE8312E6671800899322 /* SDL_systhread_c.h */; }; DB313F9417554B71006C0E22 /* SDL_systhread.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFE8B12E6671800899322 /* SDL_systhread.h */; }; @@ -690,7 +685,6 @@ DB31401C17554B71006C0E22 /* SDL_power.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFE4E12E6671700899322 /* SDL_power.c */; }; DB31401D17554B71006C0E22 /* SDL_assert.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFE5612E6671700899322 /* SDL_assert.c */; }; DB31401E17554B71006C0E22 /* SDL_error.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFE5912E6671700899322 /* SDL_error.c */; }; - DB31401F17554B71006C0E22 /* SDL_fatal.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFE5A12E6671700899322 /* SDL_fatal.c */; }; DB31402017554B71006C0E22 /* SDL.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFE5C12E6671700899322 /* SDL.c */; }; DB31402117554B71006C0E22 /* SDL_getenv.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFE5E12E6671700899322 /* SDL_getenv.c */; }; DB31402217554B71006C0E22 /* SDL_iconv.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFE5F12E6671700899322 /* SDL_iconv.c */; }; @@ -875,8 +869,6 @@ 04BDFE5612E6671700899322 /* SDL_assert.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SDL_assert.c; path = ../../src/SDL_assert.c; sourceTree = SOURCE_ROOT; }; 04BDFE5812E6671700899322 /* SDL_error_c.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_error_c.h; path = ../../src/SDL_error_c.h; sourceTree = SOURCE_ROOT; }; 04BDFE5912E6671700899322 /* SDL_error.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SDL_error.c; path = ../../src/SDL_error.c; sourceTree = SOURCE_ROOT; }; - 04BDFE5A12E6671700899322 /* SDL_fatal.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SDL_fatal.c; path = ../../src/SDL_fatal.c; sourceTree = SOURCE_ROOT; }; - 04BDFE5B12E6671700899322 /* SDL_fatal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_fatal.h; path = ../../src/SDL_fatal.h; sourceTree = SOURCE_ROOT; }; 04BDFE5C12E6671700899322 /* SDL.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SDL.c; path = ../../src/SDL.c; sourceTree = SOURCE_ROOT; }; 04BDFE5E12E6671700899322 /* SDL_getenv.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_getenv.c; sourceTree = ""; }; 04BDFE5F12E6671700899322 /* SDL_iconv.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_iconv.c; sourceTree = ""; }; @@ -1650,8 +1642,6 @@ 04BDFE5612E6671700899322 /* SDL_assert.c */, 04BDFE5812E6671700899322 /* SDL_error_c.h */, 04BDFE5912E6671700899322 /* SDL_error.c */, - 04BDFE5A12E6671700899322 /* SDL_fatal.c */, - 04BDFE5B12E6671700899322 /* SDL_fatal.h */, 0442EC5E12FE1C75004C9285 /* SDL_hints.c */, 04BAC0C71300C2160055DE28 /* SDL_log.c */, 04BDFE5C12E6671700899322 /* SDL.c */, @@ -1795,7 +1785,6 @@ 04BD007212E6671800899322 /* SDL_sysjoystick.h in Headers */, 04BD009B12E6671800899322 /* SDL_assert_c.h in Headers */, 04BD009E12E6671800899322 /* SDL_error_c.h in Headers */, - 04BD00A112E6671800899322 /* SDL_fatal.h in Headers */, 04BD00BF12E6671800899322 /* SDL_sysmutex_c.h in Headers */, 04BD00C212E6671800899322 /* SDL_systhread_c.h in Headers */, 04BD00C912E6671800899322 /* SDL_systhread.h in Headers */, @@ -1889,7 +1878,6 @@ 04BD028D12E6671800899322 /* SDL_sysjoystick.h in Headers */, 04BD02B512E6671800899322 /* SDL_assert_c.h in Headers */, 04BD02B812E6671800899322 /* SDL_error_c.h in Headers */, - 04BD02BB12E6671800899322 /* SDL_fatal.h in Headers */, 04BD02D912E6671800899322 /* SDL_sysmutex_c.h in Headers */, 04BD02DC12E6671800899322 /* SDL_systhread_c.h in Headers */, 04BD02E312E6671800899322 /* SDL_systhread.h in Headers */, @@ -2033,7 +2021,6 @@ DB313F8E17554B71006C0E22 /* SDL_sysjoystick.h in Headers */, DB313F8F17554B71006C0E22 /* SDL_assert_c.h in Headers */, DB313F9017554B71006C0E22 /* SDL_error_c.h in Headers */, - DB313F9117554B71006C0E22 /* SDL_fatal.h in Headers */, DB313F9217554B71006C0E22 /* SDL_sysmutex_c.h in Headers */, DB313F9317554B71006C0E22 /* SDL_systhread_c.h in Headers */, DB313F9417554B71006C0E22 /* SDL_systhread.h in Headers */, @@ -2345,7 +2332,6 @@ 04BD009612E6671800899322 /* SDL_power.c in Sources */, 04BD009C12E6671800899322 /* SDL_assert.c in Sources */, 04BD009F12E6671800899322 /* SDL_error.c in Sources */, - 04BD00A012E6671800899322 /* SDL_fatal.c in Sources */, 04BD00A212E6671800899322 /* SDL.c in Sources */, 04BD00A312E6671800899322 /* SDL_getenv.c in Sources */, 04BD00A412E6671800899322 /* SDL_iconv.c in Sources */, @@ -2464,7 +2450,6 @@ 04BD02B012E6671800899322 /* SDL_power.c in Sources */, 04BD02B612E6671800899322 /* SDL_assert.c in Sources */, 04BD02B912E6671800899322 /* SDL_error.c in Sources */, - 04BD02BA12E6671800899322 /* SDL_fatal.c in Sources */, 04BD02BC12E6671800899322 /* SDL.c in Sources */, 04BD02BD12E6671800899322 /* SDL_getenv.c in Sources */, 04BD02BE12E6671800899322 /* SDL_iconv.c in Sources */, @@ -2581,7 +2566,6 @@ DB31401C17554B71006C0E22 /* SDL_power.c in Sources */, DB31401D17554B71006C0E22 /* SDL_assert.c in Sources */, DB31401E17554B71006C0E22 /* SDL_error.c in Sources */, - DB31401F17554B71006C0E22 /* SDL_fatal.c in Sources */, DB31402017554B71006C0E22 /* SDL.c in Sources */, DB31402117554B71006C0E22 /* SDL_getenv.c in Sources */, DB31402217554B71006C0E22 /* SDL_iconv.c in Sources */, diff --git a/src/SDL.c b/src/SDL.c index f73bdb59b..2fdefd9d2 100644 --- a/src/SDL.c +++ b/src/SDL.c @@ -25,7 +25,6 @@ #include "SDL.h" #include "SDL_bits.h" #include "SDL_revision.h" -#include "SDL_fatal.h" #include "SDL_assert_c.h" #include "events/SDL_events_c.h" #include "haptic/SDL_haptic_c.h" @@ -240,11 +239,6 @@ SDL_Init(Uint32 flags) return (-1); } - /* Everything is initialized */ - if (!(flags & SDL_INIT_NOPARACHUTE)) { - SDL_InstallParachute(); - } - return (0); } diff --git a/src/SDL_fatal.c b/src/SDL_fatal.c deleted file mode 100644 index 6600df506..000000000 --- a/src/SDL_fatal.c +++ /dev/null @@ -1,36 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2013 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. -*/ -#include "SDL_config.h" - - -void -SDL_InstallParachute(void) -{ - return; -} - -void -SDL_UninstallParachute(void) -{ - return; -} - -/* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/SDL_fatal.h b/src/SDL_fatal.h deleted file mode 100644 index 3a81689b9..000000000 --- a/src/SDL_fatal.h +++ /dev/null @@ -1,27 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2013 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. -*/ -#include "SDL_config.h" - -/* General fatal signal handling code for SDL */ - -extern void SDL_InstallParachute(void); -extern void SDL_UninstallParachute(void); -/* vi: set ts=4 sw=4 expandtab: */