Amebis/stdex
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

socket: sync Windows build

Browse Source 
Signed-off-by: Simon Rozman <simon@rozman.si>
This commit is contained in:
Simon Rozman 2024-08-19 13:01:13 +02:00
parent 7b21a3983c
commit e24bd3d1fa
1 changed files with 8 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
include/stdex/socket.hpp
View File

@ -10,6 +10,7 @@
#if defined(_WIN32) #if defined(_WIN32)
#include "windows.h" #include "windows.h"
#include <WinSock2.h> #include <WinSock2.h>
#include <WS2tcpip.h>
#else #else
#include <netdb.h> #include <netdb.h>
#include <sys/socket.h> #include <sys/socket.h>
@ -61,26 +62,26 @@ namespace stdex
/// ///
using socket = basic_sys_object<socket_t, socket_traits>; using socket = basic_sys_object<socket_t, socket_traits>;
#ifdef _WIN32
/// ///
/// Deleter for unique_ptr using FreeAddrInfoA /// Deleter for unique_ptr using freeaddrinfo
/// ///
struct FreeAddrInfoA_delete struct freeaddrinfo_delete
{ {
/// ///
/// Delete a pointer /// Delete a pointer
/// ///
void operator()(_In_ ADDRINFOA* ptr) const void operator()(_In_ struct ::addrinfo* ptr) const
{ {
FreeAddrInfoA(ptr); freeaddrinfo(ptr);
} }
}; };
/// ///
/// addrinfo struct /// addrinfo struct
/// ///
using addrinfo = std::unique_ptr<ADDRINFOA, FreeAddrInfoA_delete>; using addrinfo = std::unique_ptr<struct addrinfo, freeaddrinfo_delete>;
#ifdef _WIN32
/// ///
/// Deleter for unique_ptr using FreeAddrInfoW /// Deleter for unique_ptr using FreeAddrInfoW
/// ///
@ -98,7 +99,7 @@ namespace stdex
/// ///
/// addrinfo struct /// addrinfo struct
/// ///
using addrinfo = std::unique_ptr<ADDRINFOW, FreeAddrInfoW_delete>; using waddrinfo = std::unique_ptr<ADDRINFOW, FreeAddrInfoW_delete>;
/// ///
/// Multi-byte / Wide-character ADDRINFO wrapper class (according to _UNICODE) /// Multi-byte / Wide-character ADDRINFO wrapper class (according to _UNICODE)
@ -109,24 +110,6 @@ namespace stdex
using saddrinfo = addrinfo; using saddrinfo = addrinfo;
#endif #endif
#else #else
///
/// Deleter for unique_ptr using freeaddrinfo
///
struct freeaddrinfo_delete
{
///
/// Delete a pointer
///
void operator()(_In_ struct addrinfo* ptr) const
{
freeaddrinfo(ptr);
}
};
///
/// addrinfo struct
///
using addrinfo = std::unique_ptr<struct addrinfo, freeaddrinfo_delete>;
using saddrinfo = addrinfo; using saddrinfo = addrinfo;
#endif #endif
} }