From 39cfc880ca5317553d3152348d3f0cddbd6677f6 Mon Sep 17 00:00:00 2001
From: Ozkan Sezer <[EMAIL REDACTED]>
Date: Tue, 12 Sep 2023 23:50:00 +0300
Subject: [PATCH] updated after latest SDL3 changes
---
src/sdl2_compat.c | 8 ++++----
src/sdl3_include_wrapper.h | 6 +++---
src/sdl3_syms.h | 2 +-
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/sdl2_compat.c b/src/sdl2_compat.c
index ad1125f..fb577b8 100644
--- a/src/sdl2_compat.c
+++ b/src/sdl2_compat.c
@@ -597,13 +597,13 @@ LoadSDL3(void)
#include "x86_msvc.h"
#endif
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(__WATCOMC__)
/* NOLINTNEXTLINE(readability-redundant-declaration) */
extern void *memcpy(void *dst, const void *src, size_t len);
/* NOLINTNEXTLINE(readability-redundant-declaration) */
extern void *memset(void *dst, int c, size_t len);
-#if defined(_MSC_VER)
-#if !defined(__INTEL_LLVM_COMPILER)
+#ifdef _MSC_VER
+#ifndef __INTEL_LLVM_COMPILER
#pragma intrinsic(memcpy)
#pragma intrinsic(memset)
#endif
@@ -4309,7 +4309,7 @@ SDL_GetAudioDeviceStatus(SDL_AudioDeviceID dev)
if (stream2) {
const SDL_AudioDeviceID device3 = SDL3_GetAudioStreamDevice(stream2->stream3);
if (device3) {
- retval = SDL3_IsAudioDevicePaused(device3) ? SDL2_AUDIO_PAUSED : SDL2_AUDIO_PLAYING;
+ retval = SDL3_AudioDevicePaused(device3) ? SDL2_AUDIO_PAUSED : SDL2_AUDIO_PLAYING;
}
}
return retval;
diff --git a/src/sdl3_include_wrapper.h b/src/sdl3_include_wrapper.h
index bace9c2..9e292dc 100644
--- a/src/sdl3_include_wrapper.h
+++ b/src/sdl3_include_wrapper.h
@@ -910,7 +910,7 @@
#define SDL_LoadWAV IGNORE_THIS_VERSION_OF_SDL_LoadWAV
#define SDL_PauseAudioDevice IGNORE_THIS_VERSION_OF_SDL_PauseAudioDevice
#define SDL_ResumeAudioDevice IGNORE_THIS_VERSION_OF_SDL_ResumeAudioDevice
-#define SDL_IsAudioDevicePaused IGNORE_THIS_VERSION_OF_SDL_IsAudioDevicePaused
+#define SDL_AudioDevicePaused IGNORE_THIS_VERSION_OF_SDL_AudioDevicePaused
#define SDL_GetAudioStreamDevice IGNORE_THIS_VERSION_OF_SDL_GetAudioStreamDevice
#define SDL_ShowWindowSystemMenu IGNORE_THIS_VERSION_OF_SDL_ShowWindowSystemMenu
#define SDL_ReadS16LE IGNORE_THIS_VERSION_OF_SDL_ReadS16LE
@@ -4487,8 +4487,8 @@
#undef SDL_ResumeAudioDevice
#endif
-#ifdef SDL_IsAudioDevicePaused
-#undef SDL_IsAudioDevicePaused
+#ifdef SDL_AudioDevicePaused
+#undef SDL_AudioDevicePaused
#endif
#ifdef SDL_GetAudioStreamDevice
diff --git a/src/sdl3_syms.h b/src/sdl3_syms.h
index 92066fb..75ee98a 100644
--- a/src/sdl3_syms.h
+++ b/src/sdl3_syms.h
@@ -898,7 +898,7 @@ SDL3_SYM(int,MixAudioFormat,(Uint8 *a, const Uint8 *b, SDL_AudioFormat c, Uint32
SDL3_SYM(int,GetSilenceValueForFormat,(SDL_AudioFormat a),(a),return)
SDL3_SYM(int,PauseAudioDevice,(SDL_AudioDeviceID a),(a),return)
SDL3_SYM(int,ResumeAudioDevice,(SDL_AudioDeviceID a),(a),return)
-SDL3_SYM(SDL_bool,IsAudioDevicePaused,(SDL_AudioDeviceID a),(a),return)
+SDL3_SYM(SDL_bool,AudioDevicePaused,(SDL_AudioDeviceID a),(a),return)
SDL3_SYM(SDL_AudioDeviceID,GetAudioStreamDevice,(SDL_AudioStream *a),(a),return)
#ifdef __GDK__
SDL3_SYM_PASSTHROUGH(int,GDKGetDefaultUser,(XUserHandle *a),(a),return)