From 9c8642ded9d8df04bb663c77caf59b57c8a3bc02 Mon Sep 17 00:00:00 2001
From: Sam Lantinga <[EMAIL REDACTED]>
Date: Sun, 22 Jan 2023 09:14:12 -0800
Subject: [PATCH] Removed SDL_INIT_NOPARACHUTE
Fixes https://github.com/libsdl-org/SDL/issues/7121
---
docs/README-migration.md | 3 +++
include/SDL3/SDL_init.h | 4 ----
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/docs/README-migration.md b/docs/README-migration.md
index b6ece31801c6..f073d94b07b5 100644
--- a/docs/README-migration.md
+++ b/docs/README-migration.md
@@ -284,6 +284,9 @@ The following hints have been removed:
The following symbols have been renamed:
* SDL_INIT_GAMECONTROLLER => SDL_INIT_GAMEPAD
+The following symbols have been removed:
+* SDL_INIT_NOPARACHUTE
+
## SDL_joystick.h
SDL_JoystickID has changed from Sint32 to Uint32, with an invalid ID being 0.
diff --git a/include/SDL3/SDL_init.h b/include/SDL3/SDL_init.h
index b1f15b749cc1..7e49f790a7b5 100644
--- a/include/SDL3/SDL_init.h
+++ b/include/SDL3/SDL_init.h
@@ -53,7 +53,6 @@ extern "C" {
#define SDL_INIT_GAMEPAD 0x00002000u /**< SDL_INIT_GAMEPAD implies SDL_INIT_JOYSTICK */
#define SDL_INIT_EVENTS 0x00004000u
#define SDL_INIT_SENSOR 0x00008000u
-#define SDL_INIT_NOPARACHUTE 0x00100000u /**< compatibility; this flag is ignored. */
#define SDL_INIT_EVERYTHING ( \
SDL_INIT_TIMER | SDL_INIT_AUDIO | SDL_INIT_VIDEO | SDL_INIT_EVENTS | \
SDL_INIT_JOYSTICK | SDL_INIT_HAPTIC | SDL_INIT_GAMEPAD | SDL_INIT_SENSOR \
@@ -89,7 +88,6 @@ extern "C" {
* initializes the joystick subsystem
* - `SDL_INIT_EVENTS`: events subsystem
* - `SDL_INIT_EVERYTHING`: all of the above subsystems
- * - `SDL_INIT_NOPARACHUTE`: compatibility; this flag is ignored
*
* Subsystem initialization is ref-counted, you must call SDL_QuitSubSystem()
* for each SDL_InitSubSystem() to correctly shutdown a subsystem manually (or
@@ -148,8 +146,6 @@ extern DECLSPEC void SDLCALL SDL_QuitSubSystem(Uint32 flags);
* \returns a mask of all initialized subsystems if `flags` is 0, otherwise it
* returns the initialization status of the specified subsystems.
*
- * The return value does not include SDL_INIT_NOPARACHUTE.
- *
* \since This function is available since SDL 3.0.0.
*
* \sa SDL_Init