Merge pull request #1349 from piponazo/027_Winsock2

0.27 winsock2 changes
Exiv2 · Oct 8, 2020 · 203c390 · 203c390
2 parents 632684f + 7784795
commit 203c390
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -10,7 +10,6 @@ project(exiv2          # use TWEAK to categorize the build
     LANGUAGES CXX
 )
 include(cmake/mainSetup.cmake  REQUIRED)
-add_compile_options(-DEXIV2_BUILDING_EXIV2)
 
 # options and their default values
 option( BUILD_SHARED_LIBS             "Build exiv2lib as a shared library"                    ON  )

diff --git a/cmake/compilerFlags.cmake b/cmake/compilerFlags.cmake
@@ -139,7 +139,7 @@ if(MSVC)
 
     # Object Level Parallelism
     add_compile_options(/MP)
-    add_definitions(-DNOMINMAX -DWIN32_LEAN_AND_MEAN)
+    add_definitions(-DNOMINMAX)	# This definition is not only needed for Exiv2 but also for xmpsdk
 
     # https://devblogs.microsoft.com/cppblog/msvc-now-correctly-reports-__cplusplus/
     if (MSVC_VERSION GREATER_EQUAL "1910") # VS2017 and up

diff --git a/include/exiv2/config.h b/include/exiv2/config.h
@@ -92,12 +92,6 @@ typedef int pid_t;
 # endif
 #endif
 //////////////////////////////////////
-#if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW__)
-#ifdef EXIV2_BUILDING_EXIV2
-#define __USE_W32_SOCKETS
-#include <winsock2.h>
-#endif
-#endif
 
 
 // https://softwareengineering.stackexchange.com/questions/291141/how-to-handle-design-changes-for-auto-ptr-deprecation-in-c11

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -192,7 +192,9 @@ if (EXIV2_ENABLE_WEBREADY)
 endif()
 
 if (WIN32)
-    target_compile_definitions(exiv2lib PRIVATE PSAPI_VERSION=1) # to be compatible with <= WinVista (#905)
+    target_compile_definitions(exiv2lib PRIVATE PSAPI_VERSION=1)    # to be compatible with <= WinVista (#905)
+    # Since windows.h is included in some headers, we need to propagate this definition
+    target_compile_definitions(exiv2lib PUBLIC WIN32_LEAN_AND_MEAN) 
 endif()
 
 if (NOT MSVC)

diff --git a/src/http.cpp b/src/http.cpp
@@ -18,7 +18,11 @@
  * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA.
  */
 
-// included header files
+#if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW__)	
+#define __USE_W32_SOCKETS
+#include <winsock2.h>
+#endif
+
 #include "config.h"
 #include "datasets.hpp"
 #include "http.hpp"
@@ -40,6 +44,7 @@
 
 ////////////////////////////////////////
 // platform specific code
+
 #if defined(WIN32) || defined(_MSC_VER) || defined(__MINGW__)
 #include <string.h>
 #include <io.h>