Merge pull request #1336 from Exiv2/fix_1335_winsock2_0.27

fix_1335_winsock2_0.27
5 years ago · fcdf0099d6
parent ff68b135a0 7ff0e0613a
commit fcdf0099d6
2 changed files with 5 additions and 5 deletions
--- a/include/exiv2/config.h
+++ b/include/exiv2/config.h
@ -93,11 +93,6 @@ typedef int pid_t;
 #endif
 //////////////////////////////////////

-#if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW__)
-#define __USE_W32_SOCKETS
-#include <winsock2.h>
-#endif
-
 // https://softwareengineering.stackexchange.com/questions/291141/how-to-handle-design-changes-for-auto-ptr-deprecation-in-c11
 #if __cplusplus >= 201103L
  #include <memory>
--- a/src/http.cpp
+++ b/src/http.cpp
@ -40,6 +40,11 @@

 ////////////////////////////////////////
 // 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>