Integrated upstream changes, since I forgot to pull before making local changes.

includes/easysock.h

@@ -9,7 +9,7 @@ extern "C" {
 	#include <winsock.h>
 	#include <ws2tcpip.h>
 #endif
-#ifdef __unix__
+#if defined(__unix) || defined(__unix) || (defined(__APPLE__) && defined(__MACH__))
 	#include <sys/types.h>
 	#include <sys/socket.h>
 	#include <netdb.h>

includes/sock.hpp

@@ -2,7 +2,7 @@
 #define _SOCK_CLASS
 
 #include <string>
-#ifdef __unix__
+#if defined(__unix__) || defined(__unix) ||(defined(__APPLE__) && defined(__MACH__))
 	#include <sys/socket.h>
 #endif
 #ifdef _WIN32

meson.build

@@ -1,5 +1,6 @@
 project('Pong', ['cpp', 'c'], version: '0.1')
 add_global_arguments('-g', '-Wall', '-pedantic', '-Wno-unused-function', '-Wno-narrowing', language : ['cpp', 'c'])
+add_global_arguments('-std=c++11', language: ['cpp'])
 compiler = meson.get_compiler('cpp')
 cmake = import('cmake')
 

serialization.c

@@ -2,7 +2,7 @@
 #include <stdlib.h>
 #include <stdbool.h>
 #include <string.h>
-#ifdef __unix__
+#if defined(__unix__) || defined(__unix) || (defined(__APPLE__) && defined(__MACH__))
 	#include <arpa/inet.h>
 #endif
 #ifdef _WIN32

server.cpp

@@ -1,4 +1,4 @@
-#ifdef __unix__
+#if defined(__unix__) || defined(__unix) || (defined(__APPLE__) && defined(__MACH__))
 	#include <sys/socket.h>
 #endif
 #ifdef _WIN32