SDL_mixer: Updated for recent SDL3 changes

From 087004f32e69c34a72f264dc36b057fd76f908b9 Mon Sep 17 00:00:00 2001
From: Sam Lantinga <[EMAIL REDACTED]>
Date: Mon, 12 Feb 2024 11:31:46 -0800
Subject: [PATCH] Updated for recent SDL3 changes

---
 external/SDL                   | 2 +-
 include/SDL3_mixer/SDL_mixer.h | 8 ++------
 src/mixer.c                    | 8 ++++----
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/external/SDL b/external/SDL
index 649556be..814a94c3 160000
--- a/external/SDL
+++ b/external/SDL
@@ -1 +1 @@
-Subproject commit 649556befa156201116a4f25089597463d0efd44
+Subproject commit 814a94c34985c6d3a7fbd906885b1dfea0979925
diff --git a/include/SDL3_mixer/SDL_mixer.h b/include/SDL3_mixer/SDL_mixer.h
index 2023abe5..408dbd13 100644
--- a/include/SDL3_mixer/SDL_mixer.h
+++ b/include/SDL3_mixer/SDL_mixer.h
@@ -29,11 +29,7 @@
 #ifndef SDL_MIXER_H_
 #define SDL_MIXER_H_
 
-#include <SDL3/SDL_stdinc.h>
-#include <SDL3/SDL_rwops.h>
-#include <SDL3/SDL_audio.h>
-#include <SDL3/SDL_endian.h>
-#include <SDL3/SDL_version.h>
+#include <SDL3/SDL.h>
 #include <SDL3/SDL_begin_code.h>
 
 /* Set up for C function definitions, even when using C++ */
@@ -100,7 +96,7 @@ extern "C" {
  *
  * \since This function is available since SDL_mixer 3.0.0.
  */
-extern DECLSPEC const SDL_version * SDLCALL Mix_Linked_Version(void);
+extern DECLSPEC const SDL_Version * SDLCALL Mix_Linked_Version(void);
 
 /**
  * Initialization flags
diff --git a/src/mixer.c b/src/mixer.c
index 340731f8..412e8a0e 100644
--- a/src/mixer.c
+++ b/src/mixer.c
@@ -48,11 +48,11 @@ SDL_COMPILE_TIME_ASSERT(SDL_BUILD_MICRO_VERSION,
 
 #if defined(SDL_COMPILE_TIME_ASSERT)
 SDL_COMPILE_TIME_ASSERT(SDL_MIXER_MAJOR_VERSION_min, SDL_MIXER_MAJOR_VERSION >= 0);
-/* Limited only by the need to fit in SDL_version */
+/* Limited only by the need to fit in SDL_Version */
 SDL_COMPILE_TIME_ASSERT(SDL_MIXER_MAJOR_VERSION_max, SDL_MIXER_MAJOR_VERSION <= 255);
 
 SDL_COMPILE_TIME_ASSERT(SDL_MIXER_MINOR_VERSION_min, SDL_MIXER_MINOR_VERSION >= 0);
-/* Limited only by the need to fit in SDL_version */
+/* Limited only by the need to fit in SDL_Version */
 SDL_COMPILE_TIME_ASSERT(SDL_MIXER_MINOR_VERSION_max, SDL_MIXER_MINOR_VERSION <= 255);
 
 SDL_COMPILE_TIME_ASSERT(SDL_MIXER_PATCHLEVEL_min, SDL_MIXER_PATCHLEVEL >= 0);
@@ -162,9 +162,9 @@ void add_chunk_decoder(const char *decoder)
 }
 
 /* rcg06192001 get linked library's version. */
-const SDL_version *Mix_Linked_Version(void)
+const SDL_Version *Mix_Linked_Version(void)
 {
-    static SDL_version linked_version;
+    static SDL_Version linked_version;
     SDL_MIXER_VERSION(&linked_version);
     return &linked_version;
 }