mirror of
https://github.com/LadybirdBrowser/ladybird.git
synced 2025-08-15 23:09:05 +00:00
LibCore: Allow winsock2.h to be included after SocketAddressWindows.h
This commit is contained in:
parent
eb650798d0
commit
170f056805
Notes:
github-actions[bot]
2025-02-05 23:09:07 +00:00
Author: https://github.com/stasoid
Commit: 170f056805
Pull-request: https://github.com/LadybirdBrowser/ladybird/pull/2673
Reviewed-by: https://github.com/ADKaster ✅
Reviewed-by: https://github.com/gmta
Reviewed-by: https://github.com/konradekk
1 changed files with 39 additions and 1 deletions
|
@ -9,6 +9,7 @@
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
|
typedef int INT;
|
||||||
typedef unsigned long ULONG;
|
typedef unsigned long ULONG;
|
||||||
typedef unsigned short USHORT;
|
typedef unsigned short USHORT;
|
||||||
typedef char CHAR;
|
typedef char CHAR;
|
||||||
|
@ -19,7 +20,6 @@ typedef USHORT ADDRESS_FAMILY;
|
||||||
#define FAR
|
#define FAR
|
||||||
#include <inaddr.h>
|
#include <inaddr.h>
|
||||||
#undef WINAPI_FAMILY_PARTITION
|
#undef WINAPI_FAMILY_PARTITION
|
||||||
#undef FAR
|
|
||||||
|
|
||||||
#include <afunix.h>
|
#include <afunix.h>
|
||||||
|
|
||||||
|
@ -67,6 +67,7 @@ struct sockaddr {
|
||||||
ADDRESS_FAMILY sa_family;
|
ADDRESS_FAMILY sa_family;
|
||||||
CHAR sa_data[14];
|
CHAR sa_data[14];
|
||||||
};
|
};
|
||||||
|
using LPSOCKADDR = sockaddr*;
|
||||||
|
|
||||||
struct addrinfo {
|
struct addrinfo {
|
||||||
int ai_flags;
|
int ai_flags;
|
||||||
|
@ -79,4 +80,41 @@ struct addrinfo {
|
||||||
addrinfo* ai_next;
|
addrinfo* ai_next;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
struct SOCKET_ADDRESS {
|
||||||
|
sockaddr* lpSockaddr;
|
||||||
|
INT iSockaddrLength;
|
||||||
|
};
|
||||||
|
|
||||||
|
struct SOCKET_ADDRESS_LIST {
|
||||||
|
INT iAddressCount;
|
||||||
|
SOCKET_ADDRESS Address[1];
|
||||||
|
};
|
||||||
|
using PSOCKET_ADDRESS_LIST = SOCKET_ADDRESS_LIST*;
|
||||||
|
|
||||||
|
struct CSADDR_INFO {
|
||||||
|
SOCKET_ADDRESS LocalAddr;
|
||||||
|
SOCKET_ADDRESS RemoteAddr;
|
||||||
|
INT iSocketType;
|
||||||
|
INT iProtocol;
|
||||||
|
};
|
||||||
|
using LPCSADDR_INFO = CSADDR_INFO*;
|
||||||
|
|
||||||
|
struct WSABUF {
|
||||||
|
ULONG len;
|
||||||
|
CHAR* buf;
|
||||||
|
};
|
||||||
|
using LPWSABUF = WSABUF*;
|
||||||
|
|
||||||
|
struct WSAMSG {
|
||||||
|
LPSOCKADDR name;
|
||||||
|
INT namelen;
|
||||||
|
LPWSABUF lpBuffers;
|
||||||
|
ULONG dwBufferCount;
|
||||||
|
WSABUF Control;
|
||||||
|
ULONG dwFlags;
|
||||||
|
};
|
||||||
|
using LPWSAMSG = WSAMSG*;
|
||||||
|
|
||||||
extern "C" USHORT __stdcall htons(USHORT hostshort);
|
extern "C" USHORT __stdcall htons(USHORT hostshort);
|
||||||
|
|
||||||
|
#define _WS2DEF_ // don't include ws2def.h
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue