pragma warning(disable) is only valid for MSVC

TheAssemblyArmada · Mar 24, 2024 · 7d10a4b · 7d10a4b
1 parent 77e2da0
commit 7d10a4b
Show file tree

Hide file tree

Showing 10 changed files with 26 additions and 2 deletions.
diff --git a/common/field.cpp b/common/field.cpp
@@ -34,7 +34,9 @@
 #include "endianness.h"
 
 // ST - 12/18/2018 10:14AM
+#ifdef _MSC_VER
 #pragma warning(disable : 4996)
+#endif
 
 FieldClass::FieldClass(const char* id, char data)
 {

diff --git a/common/graphicsviewport.cpp b/common/graphicsviewport.cpp
@@ -779,7 +779,9 @@ unsigned int GraphicViewPortClass::Print(char const* str, int x, int y, int fcol
     return (return_code);
 }
 
+#ifdef _MSC_VER
 #pragma warning(disable : 4996)
+#endif
 
 /***************************************************************************
  * GVPC::PRINT -- Stub function to print an integer                        *

diff --git a/common/packet.cpp b/common/packet.cpp
@@ -402,7 +402,9 @@ bool PacketClass::Get_Field(const char* id, int& data)
  * HISTORY:                                                               *
  *   04/23/1996 PWG : Created.                                            *
  *========================================================================*/
+#ifdef _MSC_VER
 #pragma warning(disable : 4996)
+#endif
 bool PacketClass::Get_Field(const char* id, char* data)
 {
     FieldClass* field = Find_Field(id);

diff --git a/common/shape.h b/common/shape.h
@@ -129,7 +129,9 @@ typedef struct
 /*
 ------------------------------- Shape block ---------------------------------
 */
+#ifdef _MSC_VER
 #pragma warning(disable : 4200)
+#endif
 #pragma pack(push, 2)
 typedef struct
 {

diff --git a/redalert/dllinterface.cpp b/redalert/dllinterface.cpp
@@ -25,7 +25,9 @@
 */
 
 // Exception handling isn't enabled
+#ifdef _MSC_VER
 #pragma warning(disable : 4530) // warning C4530: C++ exception handler used, but unwind semantics are not enabled.
+#endif
 
 #include <string>
 #include <vector>
@@ -73,7 +75,9 @@ typedef __int64 int64;
 **
 */
 // For compatibility with Watcom in audio enums
+#ifdef _MSC_VER
 #pragma warning(disable : 4091)
+#endif
 
 // From RedAlert\Audio.cpp
 typedef enum
@@ -8749,4 +8753,4 @@ void DLL_Code_Pointers(void)
 void DLL_Decode_Pointers(void)
 {
     DLLExportClass::Decode_Pointers();
-}
+}
diff --git a/tiberiandawn/conquer.cpp b/tiberiandawn/conquer.cpp
@@ -3613,7 +3613,9 @@ static bool Change_Local_Dir(int cd)
  *   07/11/1995 JLB : Created.                                                                 *
  *   05/22/1996  ST : Handles multiple CD drives / CD changers                                 *
  *=============================================================================================*/
+#ifdef _MSC_VER
 #pragma warning(disable : 4101)
+#endif
 bool Force_CD_Available(int cd)
 {
 

diff --git a/tiberiandawn/defines.h b/tiberiandawn/defines.h
@@ -177,8 +177,10 @@
 // typedef enums with -1 will show this warning, even when the type of the enum is signed. It's a compiler bug,
 // apparently ST - 1/8/2019 9:23AM
 //
+#ifdef _MSC_VER
 #pragma warning(push)
 #pragma warning(disable : 4341)
+#endif
 
 /**********************************************************************
 **	These enumerations are used to implement RTTI.
@@ -3042,6 +3044,8 @@ typedef enum StrategyType : unsigned char
 
 #endif // USE_RA_AI
 
+#ifdef _MSC_VER
 #pragma warning(pop)
+#endif
 
 #endif
diff --git a/tiberiandawn/dllinterface.cpp b/tiberiandawn/dllinterface.cpp
@@ -66,7 +66,9 @@ typedef __int64 int64;
 **
 */
 // For compatibility with Watcom in audio enums
+#ifdef _MSC_VER
 #pragma warning(disable : 4091)
+#endif
 
 // From TiberianDawn\Audio.cpp
 typedef enum
@@ -7721,4 +7723,4 @@ void DLL_Code_Pointers(void)
 void DLL_Decode_Pointers(void)
 {
     DLLExportClass::Decode_Pointers();
-}
+}
diff --git a/tiberiandawn/iomap.cpp b/tiberiandawn/iomap.cpp
@@ -65,7 +65,9 @@
 
 #include "function.h"
 
+#ifdef _MSC_VER
 #pragma warning(disable : 4302) // Truncation from pointer to TARGET
+#endif
 
 /***********************************************************************************************
  * CellClass::Should_Save -- Should the cell be written to disk?                               *

diff --git a/tiberiandawn/ioobj.cpp b/tiberiandawn/ioobj.cpp
@@ -130,7 +130,9 @@
 
 #include "function.h"
 
+#ifdef _MSC_VER
 #pragma warning(disable : 4302) // Truncation from pointer to TARGET
+#endif
 
 /***********************************************************************************************
  * TeamTypeClass::Load -- Loads from a save game file.                                         *