diff --git a/Sources/Plasma/CoreLib/hsConfig.h b/Sources/Plasma/CoreLib/hsConfig.h
index c552b34a..10878ae5 100644
--- a/Sources/Plasma/CoreLib/hsConfig.h
+++ b/Sources/Plasma/CoreLib/hsConfig.h
@@ -102,7 +102,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 
 
 #ifdef HS_BUILD_FOR_WIN32
-#   define CDECL __cdecl
+#    ifndef CDECL
+#        define CDECL __cdecl
+#    endif
 #else
 #   define CDECL
 #endif
diff --git a/Sources/Plasma/CoreLib/hsTypes.h b/Sources/Plasma/CoreLib/hsTypes.h
index 8dc0a9b5..d0f920ca 100644
--- a/Sources/Plasma/CoreLib/hsTypes.h
+++ b/Sources/Plasma/CoreLib/hsTypes.h
@@ -582,7 +582,7 @@ void DebugMsgV (const char fmt[], va_list args);
 #ifdef PLASMA_EXTERNAL_RELEASE
 
     #define hsStatusMessage(x)                  NULL_STMT
-    #define hsStatusMessageF(x,y)               NULL_STMT
+    #define hsStatusMessageF(x, ...)            NULL_STMT
 
 #else   /* Not external release */