third_party/exiv2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

don't use w32 sockets for cygwin

Browse Source 
Not needed.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev 2022-08-07 19:28:06 -07:00
parent 350541f22a
commit 9aaeb893ee
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/CMakeLists.txt
View File

@ -218,7 +218,7 @@ if (NOT MSVC)
target_link_libraries( exiv2lib PRIVATE -lprocstat)
endif()
if (CYGWIN OR MINGW OR MSYS)
if (MINGW)
target_link_libraries( exiv2lib PRIVATE psapi ws2_32 shell32 )
endif()

9
src/http.cpp
View File

@ -2,7 +2,7 @@
#include "config.h"
#if defined(_WIN32) || defined(__CYGWIN__)
#if defined(_WIN32)
#define __USE_W32_SOCKETS
#include <winsock2.h>
#endif
@ -18,8 +18,7 @@
////////////////////////////////////////
// platform specific code
#if defined(_WIN32) || defined(__CYGWIN__)
#else
#ifndef _WIN32
////////////////////////////////////////
// Unix or Mac
@ -122,7 +121,7 @@ static Exiv2::Dictionary stringToDict(const std::string& s) {
}
static int makeNonBlocking(int sockfd) {
#if defined(_WIN32) || defined(__CYGWIN__)
#if defined(_WIN32)
ULONG ioctl_opt = 1;
return ioctlsocket(sockfd, FIONBIO, &ioctl_opt);
#else
@ -147,7 +146,7 @@ int Exiv2::http(Exiv2::Dictionary& request, Exiv2::Dictionary& response, std::st
////////////////////////////////////
// Windows specific code
#if defined(_WIN32) || defined(__CYGWIN__)
#if defined(_WIN32)
WSADATA wsaData;
WSAStartup(MAKEWORD(2, 2), &wsaData);
#endif