From f0566702c5e4c3522148fca6c65e83fb57326ddb Mon Sep 17 00:00:00 2001
From: Cameron Cawley <ccawley2011@gmail.com>
Date: Thu, 19 May 2022 16:58:11 +0100
Subject: [PATCH] Fix enabling SDL_DYNAMIC_API in OpenWatcom builds

---
 src/SDL_internal.h      | 3 +--
 src/dynapi/SDL2.exports | 1 +
 src/dynapi/SDL_dynapi.h | 2 --
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/SDL_internal.h b/src/SDL_internal.h
index 69da271c6..43e407f87 100644
--- a/src/SDL_internal.h
+++ b/src/SDL_internal.h
@@ -43,10 +43,9 @@
 
 #if SDL_DYNAMIC_API
 #include "dynapi/SDL_dynapi_overrides.h"
-/* force DECLSPEC and SDLCALL off...it's all internal symbols now.
+/* force DECLSPEC off...it's all internal symbols now.
    These will have actual #defines during SDL_dynapi.c only */
 #define DECLSPEC
-#define SDLCALL
 #endif
 
 #include "SDL_config.h"
diff --git a/src/dynapi/SDL2.exports b/src/dynapi/SDL2.exports
index c1c4f290e..3d09d1108 100644
--- a/src/dynapi/SDL2.exports
+++ b/src/dynapi/SDL2.exports
@@ -1,5 +1,6 @@
 # Windows exports file for Watcom
 # DO NOT EDIT THIS FILE BY HAND. It is autogenerated by gendynapi.pl.
+++'_SDL_DYNAPI_entry'.'SDL2.dll'.'SDL_DYNAPI_entry'
 ++'_SDL_SetError'.'SDL2.dll'.'SDL_SetError'
 ++'_SDL_Log'.'SDL2.dll'.'SDL_Log'
 ++'_SDL_LogVerbose'.'SDL2.dll'.'SDL_LogVerbose'
diff --git a/src/dynapi/SDL_dynapi.h b/src/dynapi/SDL_dynapi.h
index 330b3426c..e37444fd9 100644
--- a/src/dynapi/SDL_dynapi.h
+++ b/src/dynapi/SDL_dynapi.h
@@ -61,8 +61,6 @@
 #define SDL_DYNAMIC_API 0  /* vitasdk doesn't support dynamic linking */
 #elif defined(__NGAGE__)
 #define SDL_DYNAMIC_API 0  /* The N-Gage doesn't support dynamic linking either */
-#elif defined(__OS2__) || defined(__WATCOMC__)
-#define SDL_DYNAMIC_API 0  /* see github bugs #5667 and #5669 */
 #elif defined(DYNAPI_NEEDS_DLOPEN) && !defined(HAVE_DLOPEN)
 #define SDL_DYNAMIC_API 0  /* we need dlopen(), but don't have it.... */
 #endif