From 604a268059dc4156faef16aacef6d1c092f50e9e Mon Sep 17 00:00:00 2001
From: Robin Mills <robin@clanmills.com>
Date: Fri, 2 Oct 2020 08:44:57 +0100
Subject: [PATCH] Second effort to unexpose winsock2.h from include
 <exiv2/exiv2.hpp> using EXIV2_BUILDING_EXIV2 mechanism.

---
 CMakeLists.txt         | 1 +
 include/exiv2/config.h | 7 +++++++
 src/http.cpp           | 5 -----
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c8f9d088..85b92ac7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,6 +10,7 @@ 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/include/exiv2/config.h b/include/exiv2/config.h
index 01897dea..1af0b69a 100644
--- a/include/exiv2/config.h
+++ b/include/exiv2/config.h
@@ -92,6 +92,13 @@ 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
 #if __cplusplus >= 201103L
diff --git a/src/http.cpp b/src/http.cpp
index a4c75e9b..afd79492 100644
--- a/src/http.cpp
+++ b/src/http.cpp
@@ -40,11 +40,6 @@
 
 ////////////////////////////////////////
 // platform specific code
-#if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW__)
-#define __USE_W32_SOCKETS
-#include <winsock2.h>
-#endif
-
 #if defined(WIN32) || defined(_MSC_VER) || defined(__MINGW__)
 #include <string.h>
 #include <io.h>