Merge pull request #608 from spyridon97/fix-strcasecmp-usages

gsjaardema · web-flow · commit e08560b6b43b · 2025-03-12T11:26:28.000-06:00
Fix usages of strcasecmp/strncasecmp
diff --git a/packages/seacas/libraries/ioss/src/exodus/Ioex_Utils.C b/packages/seacas/libraries/ioss/src/exodus/Ioex_Utils.C
@@ -16,7 +16,13 @@
 #include <fmt/ostream.h>
 #include <iosfwd>
 #include <netcdf.h>
+#if defined(_WIN32) && !defined(__MINGW32__)
+#include <string.h>
+#define strcasecmp  _stricmp
+#define strncasecmp _strnicmp
+#else
 #include <strings.h>
+#endif
 #include <tokenize.h>
 
 #include "Ioss_BasisVariableType.h"
diff --git a/packages/seacas/libraries/ioss/src/text_mesh/Iotm_TextMeshAdjacencyGraph.h b/packages/seacas/libraries/ioss/src/text_mesh/Iotm_TextMeshAdjacencyGraph.h
@@ -22,7 +22,13 @@
 #include <functional>
 #include <stdexcept>
 #include <numeric>
+#if defined(_WIN32) && !defined(__MINGW32__)
+#include <string.h>
+#define strcasecmp _stricmp
+#define strncasecmp _strnicmp
+#else
 #include <strings.h>
+#endif
 
 #include "Iotm_TextMeshFuncs.h"
 #include "Iotm_TextMeshDataTypes.h"
diff --git a/packages/seacas/libraries/ioss/src/text_mesh/Iotm_TextMeshAssembly.h b/packages/seacas/libraries/ioss/src/text_mesh/Iotm_TextMeshAssembly.h
@@ -24,7 +24,6 @@
 #include <functional>
 #include <stdexcept>
 #include <numeric>
-#include <strings.h>
 
 #include "Iotm_TextMeshFuncs.h"
 #include "Iotm_TextMeshEntityGroup.h"
diff --git a/packages/seacas/libraries/ioss/src/text_mesh/Iotm_TextMeshDataTypes.h b/packages/seacas/libraries/ioss/src/text_mesh/Iotm_TextMeshDataTypes.h
@@ -24,7 +24,6 @@
 #include <functional>
 #include <stdexcept>
 #include <numeric>
-#include <strings.h>
 
 #include "Iotm_TextMeshFuncs.h"
 
diff --git a/packages/seacas/libraries/ioss/src/text_mesh/Iotm_TextMeshEntityGroup.h b/packages/seacas/libraries/ioss/src/text_mesh/Iotm_TextMeshEntityGroup.h
@@ -22,7 +22,13 @@
 #include <functional>
 #include <stdexcept>
 #include <numeric>
+#if defined(_WIN32) && !defined(__MINGW32__)
+#include <string.h>
+#define strcasecmp _stricmp
+#define strncasecmp _strnicmp
+#else
 #include <strings.h>
+#endif
 
 #include "Iotm_TextMeshFuncs.h"
 
diff --git a/packages/seacas/libraries/ioss/src/text_mesh/Iotm_TextMeshNodeset.h b/packages/seacas/libraries/ioss/src/text_mesh/Iotm_TextMeshNodeset.h
@@ -22,7 +22,6 @@
 #include <functional>
 #include <stdexcept>
 #include <numeric>
-#include <strings.h>
 
 #include "Iotm_TextMeshFuncs.h"
 #include "Iotm_TextMeshEntityGroup.h"
diff --git a/packages/seacas/libraries/ioss/src/text_mesh/Iotm_TextMeshSideset.h b/packages/seacas/libraries/ioss/src/text_mesh/Iotm_TextMeshSideset.h
@@ -22,7 +22,6 @@
 #include <functional>
 #include <stdexcept>
 #include <numeric>
-#include <strings.h>
 
 #include "Iotm_TextMeshFuncs.h"
 #include "Iotm_TextMeshDataTypes.h"
diff --git a/packages/seacas/libraries/ioss/src/text_mesh/Iotm_TextMeshSidesetSkinner.h b/packages/seacas/libraries/ioss/src/text_mesh/Iotm_TextMeshSidesetSkinner.h
@@ -22,7 +22,13 @@
 #include <functional>
 #include <stdexcept>
 #include <numeric>
+#if defined(_WIN32) && !defined(__MINGW32__)
+#include <string.h>
+#define strcasecmp _stricmp
+#define strncasecmp _strnicmp
+#else
 #include <strings.h>
+#endif
 
 #include "Iotm_TextMeshFuncs.h"
 #include "Iotm_TextMeshDataTypes.h"
diff --git a/packages/seacas/libraries/ioss/src/text_mesh/Iotm_TextMeshSidesetSplitter.h b/packages/seacas/libraries/ioss/src/text_mesh/Iotm_TextMeshSidesetSplitter.h
@@ -22,7 +22,13 @@
 #include <functional>
 #include <stdexcept>
 #include <numeric>
+#if defined(_WIN32) && !defined(__MINGW32__)
+#include <string.h>
+#define strcasecmp _stricmp
+#define strncasecmp _strnicmp
+#else
 #include <strings.h>
+#endif
 
 #include "Iotm_TextMeshFuncs.h"
 #include "Iotm_TextMeshDataTypes.h"
diff --git a/packages/seacas/libraries/ioss/src/text_mesh/Iotm_TextMeshUtils.h b/packages/seacas/libraries/ioss/src/text_mesh/Iotm_TextMeshUtils.h
@@ -24,7 +24,6 @@
 #include <functional>
 #include <stdexcept>
 #include <numeric>
-#include <strings.h>
 
 #include "Iotm_TextMeshFuncs.h"
 #include "Iotm_TextMeshDataTypes.h"
diff --git a/packages/seacas/libraries/ioss/src/unit_tests/UnitTestIotmTextMeshFixture.h b/packages/seacas/libraries/ioss/src/unit_tests/UnitTestIotmTextMeshFixture.h
@@ -38,7 +38,13 @@
 
 #include <memory>
 #include <string>
+#if defined(_WIN32) && !defined(__MINGW32__)
+#include <string.h>
+#define strcasecmp  _stricmp
+#define strncasecmp _strnicmp
+#else
 #include <strings.h>
+#endif
 #include <vector>
 
 #include "text_mesh/Iotm_TextMeshNodeset.h"
diff --git a/packages/zoltan/siMPI/pyMPI/siMPI/fortran_grinder.c b/packages/zoltan/siMPI/pyMPI/siMPI/fortran_grinder.c
@@ -17,7 +17,6 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <strings.h>
 #include <ctype.h>
 #include "mpi_config.h"
 
diff --git a/packages/zoltan/siMPI/pyMPI/siMPI/fortran_parameterize.c b/packages/zoltan/siMPI/pyMPI/siMPI/fortran_parameterize.c
@@ -16,7 +16,7 @@
 
 #include <stdlib.h>
 #include <stdio.h>
-#include <strings.h>
+#include <string.h>
 #include <ctype.h>
 
 #include "mpi_config.h"
diff --git a/packages/zoltan/src/driver/dr_loadbal.c b/packages/zoltan/src/driver/dr_loadbal.c
@@ -59,8 +59,13 @@ double Timer_Callback_Time, Timer_Global_Callback_Time;
 
 #include <stdlib.h>
 #include <stdio.h>
+#if defined(_WIN32) && !defined(__MINGW32__)
 #include <string.h>
+#define strcasecmp _stricmp
+#define strncasecmp _strnicmp
+#else
 #include <strings.h>
+#endif
 #include <sys/types.h>
 #include <unistd.h>
 
diff --git a/packages/zoltan/src/driver/dr_loadbalCPP.cpp b/packages/zoltan/src/driver/dr_loadbalCPP.cpp
@@ -75,7 +75,13 @@ using namespace std;
 
 #include "zoltan_cpp.h"
 #include "dr_param_fileCPP.h"
+#if defined(_WIN32) && !defined(__MINGW32__)
+#include <string.h>
+#define strcasecmp _stricmp
+#define strncasecmp _strnicmp
+#else
 #include <strings.h>
+#endif
 
 static void test_drops(int, MESH_INFO_PTR, PARIO_INFO_PTR, Zoltan &);
 static int Num_Global_Parts;
diff --git a/packages/zoltan/src/driver/dr_param_file.c b/packages/zoltan/src/driver/dr_param_file.c
@@ -67,8 +67,13 @@
 #include <stdio.h>
 #include <mpi.h>
 #include <stdlib.h>
+#if defined(_WIN32) && !defined(__MINGW32__)
 #include <string.h>
+#define strcasecmp _stricmp
+#define strncasecmp _strnicmp
+#else
 #include <strings.h>
+#endif
 #include "zoltan.h"
 #include "dr_param_file.h"
 #include "dr_const.h"
