Merge branch 'master' into stream_context

This commit is contained in:
lganzzzo 2019-12-08 15:20:31 +02:00
commit 5240b8155b
2 changed files with 2 additions and 2 deletions

View File

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

View File

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