Skip to content

Commit

Permalink
Merge pull request #1336 from Exiv2/fix_1335_winsock2_0.27
Browse files Browse the repository at this point in the history
fix_1335_winsock2_0.27
  • Loading branch information
clanmills authored Oct 1, 2020
2 parents ff68b13 + 7ff0e06 commit fcdf009
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
5 changes: 0 additions & 5 deletions include/exiv2/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
5 changes: 5 additions & 0 deletions src/http.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down

0 comments on commit fcdf009

Please sign in to comment.