Merge branch 'dev' into zeroidc
This commit is contained in:
commit
dceba1f2f1
18 changed files with 38 additions and 43 deletions
|
@ -23,9 +23,9 @@
|
|||
|
||||
// For the struct sockaddr_storage structure
|
||||
#if defined(_WIN32) || defined(_WIN64)
|
||||
#include <WinSock2.h>
|
||||
#include <WS2tcpip.h>
|
||||
#include <Windows.h>
|
||||
#include <winsock2.h>
|
||||
#include <ws2tcpip.h>
|
||||
#include <windows.h>
|
||||
#else /* not Windows */
|
||||
#include <arpa/inet.h>
|
||||
#include <netinet/in.h>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue