From 824b6e0ca9af1f3cf8a6cd353403ef743134004b Mon Sep 17 00:00:00 2001
From: Sam Lantinga <[EMAIL REDACTED]>
Date: Mon, 16 May 2022 11:15:17 -0700
Subject: [PATCH] Removed Watcom workarounds, need to fix this in SDL
---
IMG_jpg.c | 11 +++--------
IMG_stb.c | 2 --
IMG_svg.c | 42 ++++++++++++++----------------------------
3 files changed, 17 insertions(+), 38 deletions(-)
diff --git a/IMG_jpg.c b/IMG_jpg.c
index c16ea33..0c215a3 100644
--- a/IMG_jpg.c
+++ b/IMG_jpg.c
@@ -682,17 +682,12 @@ SDL_Surface *IMG_LoadJPG_RW(SDL_RWops *src)
/* Use tinyjpeg as a fallback if we don't have a hard dependency on libjpeg */
#if SDL_IMAGE_SAVE_JPG && (defined(LOAD_JPG_DYNAMIC) || !defined(WANT_JPEGLIB))
-#ifdef __WATCOMC__ /* watcom has issues.. */
-#define ceilf ceil
-#define floorf floor
-#define cosf cos
-#else
+#define assert SDL_assert
+#define memcpy SDL_memcpy
+
#define ceilf SDL_ceilf
#define floorf SDL_floorf
#define cosf SDL_cosf
-#endif
-#define assert SDL_assert
-#define memcpy SDL_memcpy
#define tje_log SDL_Log
#define TJE_IMPLEMENTATION
diff --git a/IMG_stb.c b/IMG_stb.c
index ee1f928..e9dbf8b 100644
--- a/IMG_stb.c
+++ b/IMG_stb.c
@@ -40,10 +40,8 @@
#define strncmp SDL_strncmp
#define strtol SDL_strtol
-#ifndef __WATCOMC__ /* watcom has issues */
#define pow SDL_pow
#define ldexp SDL_scalbn
-#endif
#define STB_IMAGE_STATIC
#define STBI_NO_STDIO
diff --git a/IMG_svg.c b/IMG_svg.c
index 46713cf..a93d6d9 100644
--- a/IMG_svg.c
+++ b/IMG_svg.c
@@ -28,34 +28,6 @@
#ifdef LOAD_SVG
/* Replace C runtime functions with SDL C runtime functions for building on Windows */
-#if defined(__WATCOMC__)
- /* Watcom builds are broken with SDL math functions. */
-#define acosf(x) (float)acos((double)(x))
-#define atan2f(x,y) (float)atan2((double)(x),(double)(y))
-#define cosf(x) (float)cos((double)(x))
-#define ceilf(x) (float)ceil((double)(x))
-#define SDL_ceilf(x) (float)ceil((double)(x))
-#define fabsf(x) (float)fabs((double)(x))
-#define floorf(x) (float)floor((double)(x))
-#define fmodf(x,y) (float)fmod((double)(x),(double)(y))
-#define sinf(x) (float)sin((double)(x))
-#define sqrtf(x) (float)sqrt((double)(x))
-#define tanf(x) (float)tan((double)(x))
-#else
-#define acosf SDL_acosf
-#define atan2f SDL_atan2f
-#define cosf SDL_cosf
-#define ceilf SDL_ceilf
-#define fabs SDL_fabs
-#define fabsf SDL_fabsf
-#define floorf SDL_floorf
-#define fmodf SDL_fmodf
-#define pow SDL_pow
-#define sinf SDL_sinf
-#define sqrt SDL_sqrt
-#define sqrtf SDL_sqrtf
-#define tanf SDL_tanf
-#endif
#define free SDL_free
#define malloc SDL_malloc
#undef memcpy
@@ -77,6 +49,20 @@
#define strstr SDL_strstr
#define strtol SDL_strtol
#define strtoll SDL_strtoll
+
+#define acosf SDL_acosf
+#define atan2f SDL_atan2f
+#define cosf SDL_cosf
+#define ceilf SDL_ceilf
+#define fabs SDL_fabs
+#define fabsf SDL_fabsf
+#define floorf SDL_floorf
+#define fmodf SDL_fmodf
+#define pow SDL_pow
+#define sinf SDL_sinf
+#define sqrt SDL_sqrt
+#define sqrtf SDL_sqrtf
+#define tanf SDL_tanf
#ifndef FLT_MAX
#define FLT_MAX 3.402823466e+38F
#endif