summaryrefslogtreecommitdiffstats
path: root/WebServer
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--WebServer/Globals.h5
-rw-r--r--WebServer/Socket.h15
2 files changed, 15 insertions, 5 deletions
diff --git a/WebServer/Globals.h b/WebServer/Globals.h
index a9cf6d790..405de1075 100644
--- a/WebServer/Globals.h
+++ b/WebServer/Globals.h
@@ -17,6 +17,10 @@
#include <sys/types.h>
#include <sys/stat.h> // for mkdir
#include <sys/time.h>
+ #include <sys/socket.h>
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
+ #include <netdb.h>
#include <time.h>
#include <dirent.h>
#include <errno.h>
@@ -28,6 +32,7 @@
#include <semaphore.h>
#include <errno.h>
#include <fcntl.h>
+ #include <tr1/memory>
#endif
diff --git a/WebServer/Socket.h b/WebServer/Socket.h
index 339dae188..e38df69ea 100644
--- a/WebServer/Socket.h
+++ b/WebServer/Socket.h
@@ -32,14 +32,19 @@
#ifndef SOCKET_H
#define SOCKET_H
-#include "../source/MCSocket.h"
-// #ifdef _WIN32
-// #include <winsock2.h>
-// #endif
-#include <string>
+
+#ifndef _WIN32
+ typedef int SOCKET;
+ #define SOCKET_ERROR (-1)
+ #define closesocket close
+#endif // !_WIN32
+
+
+
+
enum TypeSocket {BlockingSocket, NonBlockingSocket};