fixing MSVC compilation errors for client2

ukaea · Aug 30, 2024 · c7936fb · c7936fb
1 parent 11eb94d
commit c7936fb
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 9 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -132,7 +132,7 @@ add_definitions(
 )
 
 if( WIN32 OR MINGW )
-  add_definitions( -D_CRT_SECURE_NO_WARNINGS )
+  add_definitions( -D_CRT_SECURE_NO_WARNINGS -DNOMINMAX )
   set( CMAKE_FIND_LIBRARY_PREFIXES "lib" "" )
   set( CMAKE_FIND_LIBRARY_SUFFIXES ".dll.a" ".dll.lib" ".a" ".lib" )
   if( MINGW )

diff --git a/source/client2/client.cpp b/source/client2/client.cpp
@@ -7,6 +7,10 @@
 #include "accAPI.h"
 #include "exceptions.hpp"
 
+#ifdef _WIN32
+#  include "windows_defines.hpp"
+#endif
+
 #include <clientserver/udaDefines.h>
 #include <logging/logging.h>
 #include <clientserver/errorLog.h>

diff --git a/source/client2/connection.cpp b/source/client2/connection.cpp
@@ -4,6 +4,7 @@
 #ifdef _WIN32
 #  include <cctype>
 #  include <winsock2.h> // must be included before connection.h to avoid macro redefinition in rpc/types.h
+#  include "windows_defines.hpp"
 #endif
 
 #include "connection.hpp"
@@ -40,10 +41,6 @@
 #  endif
 #endif
 
-#if _MSC_VER && !__INTEL_COMPILER
-#  define strncasecmp _strnicmp
-#endif
-
 #include <clientserver/errorLog.h>
 #include <clientserver/manageSockets.h>
 #include <logging/logging.h>

diff --git a/source/clientserver/memstream_win.cpp b/source/clientserver/memstream_win.cpp
@@ -2,7 +2,6 @@
 
 #include "memstream.h"
 
-#define NOMINMAX
 #include <windows.h>
 #include <cstdlib>
 #include <string.h>

diff --git a/source/clientserver/udaDefines.cpp b/source/clientserver/udaDefines.cpp
@@ -3,7 +3,6 @@
 
 #if defined(_WIN32)
 
-#define NOMINMAX
 #include <windows.h>
 #include <io.h>
 #include <fcntl.h>

diff --git a/source/server/serverMain.cpp b/source/server/serverMain.cpp
@@ -2,7 +2,6 @@
 #if defined(__GNUC__)
 #  include <unistd.h>
 #else
-#  define NOMINMAX
 #  include <windows.h>
 #  define sleep Sleep
 #endif

diff --git a/source/server2/server_main.cpp b/source/server2/server_main.cpp
@@ -2,7 +2,6 @@
 #if defined(__GNUC__)
 #  include <unistd.h>
 #else
-#  define NOMINMAX
 #  include <windows.h>
 #  define sleep Sleep
 #endif