workaround the brokenness with Watcom builds and SDL math functions

icculus · Mar 15, 2021 · d136a5c · d136a5c
1 parent cd752f6
commit d136a5c
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/src/SDL_sound_shn.c b/src/SDL_sound_shn.c
@@ -174,6 +174,10 @@ static const Uint8 ulaw_outward[13][256] = {
 #define M_PI    3.14159265358979323846
 #endif
 
+#if defined(HAVE_LIBC) && defined(__WATCOMC__) /* Watcom has issues... */
+#define SDL_log log
+#endif
+
 
 static int word_get(shn_t *shn, SDL_RWops *rw, Uint32 *word)
 {

diff --git a/src/SDL_sound_vorbis.c b/src/SDL_sound_vorbis.c
@@ -48,8 +48,6 @@
 #define memcmp SDL_memcmp
 #define memcpy SDL_memcpy
 #define qsort SDL_qsort
-#define pow SDL_pow
-#define floor SDL_floor
 #define malloc SDL_malloc
 #define realloc SDL_realloc
 #define free SDL_free
@@ -59,12 +57,16 @@
 #endif
 #define alloca(x) ((void *) SDL_stack_alloc(Uint8, (x)))
 */
+#if !(defined(HAVE_LIBC) && defined(__WATCOMC__)) /* Watcom has issues... */
+#define pow SDL_pow
+#define floor SDL_floor
 #define ldexp(v, e) SDL_scalbn((v), (e))
 #define abs(x) SDL_abs(x)
 #define cos(x) SDL_cos(x)
 #define sin(x) SDL_sin(x)
 #define log(x) SDL_log(x)
 #endif
+#endif
 #include "stb_vorbis.h"
 
 static const char *vorbis_error_string(const int err)

diff --git a/src/libmodplug/libmodplug.h b/src/libmodplug/libmodplug.h
@@ -11,6 +11,16 @@
 
 #include "SDL.h"
 
+#if defined(HAVE_LIBC) && defined(__WATCOMC__) /* Watcom has issues... */
+#define SDL_cos  cos
+#define SDL_fabs fabs
+#define SDL_log  log
+#define SDL_pow  pow
+#define SDL_sin  sin
+#define SDL_sinf sin
+#define SDL_abs  abs
+#endif
+
 #if ((defined(__GNUC__) && (__GNUC__ >= 4)) || defined(__clang__)) && !defined(_WIN32)
 #pragma GCC visibility push(hidden)
 #endif