Changeset 1452

Timestamp:

Mar 19, 2016, 5:20:36 AM (9 years ago)

Author:

valerius

Message:

sdl_mixer: Apply OS/2-specific patches.

Location:

sdl_mixer/trunk

Files:

• configure.in (modified) (1 diff)
• dynamic_mod.h (modified) (1 diff)
• dynamic_ogg.h (modified) (1 diff)
• load_flac.c (modified) (1 diff)
• mixer.c (modified) (1 diff)
• music.c (modified) (1 diff)
• music_flac.c (modified) (1 diff)
• music_mod.c (modified) (1 diff)

sdl_mixer/trunk/configure.in ¶

@@ -1 +1 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(README)
+AC_CONFIG_MACRO_DIR([acinclude])
 AC_CONFIG_AUX_DIR(build-scripts)
 

sdl_mixer/trunk/dynamic_mod.h ¶

@@ -31 +31 @@
         CHAR* (*MikMod_InfoDriver)(void);
         CHAR* (*MikMod_InfoLoader)(void);
+#ifdef __WATCOMC__
+        int (*MikMod_Init)(char const*);
+#else
         BOOL (*MikMod_Init)(CHAR*);
+#endif
         void (*MikMod_RegisterAllLoaders)(void);
         void (*MikMod_RegisterDriver)(struct MDRIVER*);
         int* MikMod_errno;
+#ifdef __WATCOMC__
+        char const* (*MikMod_strerror)(int);
+#else
         char* (*MikMod_strerror)(int);
+#endif
         BOOL (*Player_Active)(void);
         void (*Player_Free)(MODULE*);

sdl_mixer/trunk/dynamic_ogg.h ¶

@@ -32 +32 @@
         int (*ov_clear)(OggVorbis_File *vf);
         vorbis_info *(*ov_info)(OggVorbis_File *vf,int link);
+#ifdef __WATCOMC__
+        int (*ov_open_callbacks)(void *datasource, OggVorbis_File *vf, const char *initial, long ibytes, ov_callbacks callbacks);
+#else
         int (*ov_open_callbacks)(void *datasource, OggVorbis_File *vf, char *initial, long ibytes, ov_callbacks callbacks);
+#endif
         ogg_int64_t (*ov_pcm_total)(OggVorbis_File *vf,int i);
 #ifdef OGG_USE_TREMOR

sdl_mixer/trunk/load_flac.c ¶

@@ -59 +59 @@
                 FLAC_SDL_Data *data = (FLAC_SDL_Data *)client_data;
 
-                *bytes = SDL_RWread (data->sdl_src, buffer, sizeof (FLAC__byte),
+                *((int *)bytes) = SDL_RWread (data->sdl_src, buffer, sizeof (FLAC__byte),
                                                                 *bytes);
 
-                if(*bytes < 0) { // error in read
+                if(*((int *)bytes) < 0) { // error in read
                         return FLAC__STREAM_DECODER_READ_STATUS_ABORT;
                 }

sdl_mixer/trunk/mixer.c ¶

@@ -284 +284 @@
 
 /* Mixing function */
+#ifdef __WATCOMC__
+static void SDLCALL mix_channels(void *udata, Uint8 *stream, int len)
+#else
 static void mix_channels(void *udata, Uint8 *stream, int len)
+#endif
 {
         Uint8 *mix_input;

sdl_mixer/trunk/music.c ¶

@@ -1579 +1579 @@
         }
 
-#if defined(__MINGW32__) || defined(__MINGW64__)
+#if defined(__MINGW32__) || defined(__MINGW64__) || defined(__WATCOMC__)
         for (path = strtok(paths, ";"); path; path = strtok(NULL, ";")) {
 #elif defined(_WIN32)

sdl_mixer/trunk/music_flac.c ¶

@@ -61 +61 @@
         // make sure there is something to be reading
         if (*bytes > 0) {
-                *bytes = SDL_RWread (data->rwops, buffer, sizeof (FLAC__byte), *bytes);
-
-                if (*bytes < 0) { // error in read
+                *((int *)bytes) = SDL_RWread (data->rwops, buffer, sizeof (FLAC__byte), *bytes);
+
+                if (*((int *)bytes) < 0) { // error in read
                         return FLAC__STREAM_DECODER_READ_STATUS_ABORT;
                 }
-                else if (*bytes == 0 ) { // no data was read (EOF)
+                else if (*((int *)bytes) == 0 ) { // no data was read (EOF)
                         return FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM;
                 }

sdl_mixer/trunk/music_mod.c ¶

@@ -150 +150 @@
 } LMM_MREADER;
 
+#ifdef __WATCOMC__
+int LMM_Seek(struct MREADER *mr,long to,int dir)
+#else
 BOOL LMM_Seek(struct MREADER *mr,long to,int dir)
+#endif
 {
         LMM_MREADER* lmmmr = (LMM_MREADER*)mr;