Move winsock2 inclusion to http.cpp

main
Luis Díaz Más 5 years ago
parent 632684fd12
commit b304244766

@ -10,7 +10,6 @@ project(exiv2 # use TWEAK to categorize the build
LANGUAGES CXX LANGUAGES CXX
) )
include(cmake/mainSetup.cmake REQUIRED) include(cmake/mainSetup.cmake REQUIRED)
add_compile_options(-DEXIV2_BUILDING_EXIV2)
# options and their default values # options and their default values
option( BUILD_SHARED_LIBS "Build exiv2lib as a shared library" ON ) option( BUILD_SHARED_LIBS "Build exiv2lib as a shared library" ON )

@ -92,12 +92,6 @@ typedef int pid_t;
# endif # endif
#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 // https://softwareengineering.stackexchange.com/questions/291141/how-to-handle-design-changes-for-auto-ptr-deprecation-in-c11

@ -40,6 +40,11 @@
//////////////////////////////////////// ////////////////////////////////////////
// platform specific code // 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__) #if defined(WIN32) || defined(_MSC_VER) || defined(__MINGW__)
#include <string.h> #include <string.h>
#include <io.h> #include <io.h>

Loading…
Cancel
Save