Move winsock2 inclusion to http.cpp
This commit is contained in:
parent
632684fd12
commit
b304244766
@ -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 )
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user