Commit 348cc05b4f250ccba8ed7d4dbe7def2baf57be66
2023-08-02T17:10:28
minor os/2 stuff merged from the bitwiseworks' fork (cosmetics only.) (cherry picked from commit b58557a3a60de6e945536c41147061afa8468286)
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57
diff --git a/configure b/configure
index 8407ad3..d467e47 100755
--- a/configure
+++ b/configure
@@ -29640,7 +29640,7 @@ printf "%s\n" "#define SDL_VIDEO_DRIVER_OS2 1" >>confdefs.h
SOURCES="$SOURCES $srcdir/src/video/os2/*.c"
have_video=yes
- SUMMARY_video="${SUMMARY_video} os/2"
+ SUMMARY_video="${SUMMARY_video} OS/2"
fi
# Set up files for the audio library
if test x$enable_audio = xyes; then
@@ -29649,7 +29649,7 @@ printf "%s\n" "#define SDL_AUDIO_DRIVER_OS2 1" >>confdefs.h
SOURCES="$SOURCES $srcdir/src/audio/os2/*.c"
have_audio=yes
- SUMMARY_audio="${SUMMARY_audio} os/2"
+ SUMMARY_audio="${SUMMARY_audio} OS/2"
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lmmpm2"
fi
# Set up files for the thread library
diff --git a/configure.ac b/configure.ac
index 374ddb4..e9e1de7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4625,14 +4625,14 @@ dnl BeOS support removed after SDL 2.0.1. Haiku still works. --ryan.
AC_DEFINE(SDL_VIDEO_DRIVER_OS2, 1, [ ])
SOURCES="$SOURCES $srcdir/src/video/os2/*.c"
have_video=yes
- SUMMARY_video="${SUMMARY_video} os/2"
+ SUMMARY_video="${SUMMARY_video} OS/2"
fi
# Set up files for the audio library
if test x$enable_audio = xyes; then
AC_DEFINE(SDL_AUDIO_DRIVER_OS2, 1, [ ])
SOURCES="$SOURCES $srcdir/src/audio/os2/*.c"
have_audio=yes
- SUMMARY_audio="${SUMMARY_audio} os/2"
+ SUMMARY_audio="${SUMMARY_audio} OS/2"
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lmmpm2"
fi
# Set up files for the thread library
diff --git a/src/audio/os2/SDL_os2audio.c b/src/audio/os2/SDL_os2audio.c
index e8d4cb5..2f1e6bc 100644
--- a/src/audio/os2/SDL_os2audio.c
+++ b/src/audio/os2/SDL_os2audio.c
@@ -412,8 +412,8 @@ static int OS2_OpenDevice(_THIS, const char *devname)
ULONG ulRC;
ULONG ulIdx;
BOOL new_freq;
- SDL_bool iscapture = _this->iscapture;
ULONG ulHandle = (ULONG)_this->handle;
+ SDL_bool iscapture = _this->iscapture;
new_freq = FALSE;
SDL_zero(stMCIAmpOpen);