mirrors/oatpp
1
0
Fork 0
mirror of https://gitee.com/zyjblog/oatpp.git synced 2025-01-03 05:22:24 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #582 from sidaf/fix_windows

Browse Source 
Cross-compile Windows Fix
This commit is contained in:
Leonid Stryzhevskyi 2022-04-27 14:51:25 +03:00 committed by GitHub
commit 2f975359c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/oatpp/core/IODefinitions.cpp
View File

@ -25,7 +25,7 @@
#include "IODefinitions.hpp" #include "IODefinitions.hpp"
#if defined(WIN32) || defined(_WIN32) #if defined(WIN32) || defined(_WIN32)
#include <WinSock2.h> #include <winsock2.h>
#endif #endif
namespace oatpp { namespace oatpp {

2
src/oatpp/core/base/Environment.cpp
View File

@ -33,7 +33,7 @@
#include <cstdarg> #include <cstdarg>
#if defined(WIN32) || defined(_WIN32) #if defined(WIN32) || defined(_WIN32)
#include <WinSock2.h> #include <winsock2.h>
struct tm* localtime_r(time_t *_clock, struct tm *_result) { struct tm* localtime_r(time_t *_clock, struct tm *_result) {
localtime_s(_result, _clock); localtime_s(_result, _clock);

2
src/oatpp/encoding/Hex.cpp
View File

@ -25,7 +25,7 @@
#include "Hex.hpp" #include "Hex.hpp"
#if defined(WIN32) || defined(_WIN32) #if defined(WIN32) || defined(_WIN32)
#include <WinSock2.h> #include <winsock2.h>
#else #else
#include <arpa/inet.h> #include <arpa/inet.h>
#endif #endif

2
src/oatpp/encoding/Unicode.cpp
View File

@ -25,7 +25,7 @@
#include "Unicode.hpp" #include "Unicode.hpp"
#if defined(WIN32) || defined(_WIN32) #if defined(WIN32) || defined(_WIN32)
#include <Winsock2.h> #include <winsock2.h>
#else #else
#include <arpa/inet.h> #include <arpa/inet.h>
#endif #endif

2
src/oatpp/network/tcp/Connection.cpp
View File

@ -26,7 +26,7 @@
#if defined(WIN32) || defined(_WIN32) #if defined(WIN32) || defined(_WIN32)
#include <io.h> #include <io.h>
#include <WinSock2.h> #include <winsock2.h>
#else #else
#include <unistd.h> #include <unistd.h>
#include <sys/socket.h> #include <sys/socket.h>

4
src/oatpp/network/tcp/client/ConnectionProvider.cpp
View File

@ -31,8 +31,8 @@
#if defined(WIN32) || defined(_WIN32) #if defined(WIN32) || defined(_WIN32)
#include <io.h> #include <io.h>
#include <WinSock2.h> #include <winsock2.h>
#include <WS2tcpip.h> #include <ws2tcpip.h>
#else #else
#include <netdb.h> #include <netdb.h>
#include <arpa/inet.h> #include <arpa/inet.h>

4
src/oatpp/network/tcp/server/ConnectionProvider.cpp
View File

@ -30,8 +30,8 @@
#if defined(WIN32) || defined(_WIN32) #if defined(WIN32) || defined(_WIN32)
#include <io.h> #include <io.h>
#include <WinSock2.h> #include <winsock2.h>
#include <WS2tcpip.h> #include <ws2tcpip.h>
#else #else
#include <netdb.h> #include <netdb.h>
#include <arpa/inet.h> #include <arpa/inet.h>