diff options
| author | madmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2012-02-13 22:47:03 +0100 |
|---|---|---|
| committer | madmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2012-02-13 22:47:03 +0100 |
| commit | 4f17362aeb80e5339c58a5d3b0fbaeb88d9e701c (patch) | |
| tree | febea3ecd89c0d4aa83924e430bf11366d754733 /WebServer | |
| parent | New makefile with automatic *.cpp sourcefile import, automatic header file dependencies and switchable debug / release configuration. gnumake-specific :( (diff) | |
| download | cuberite-4f17362aeb80e5339c58a5d3b0fbaeb88d9e701c.tar cuberite-4f17362aeb80e5339c58a5d3b0fbaeb88d9e701c.tar.gz cuberite-4f17362aeb80e5339c58a5d3b0fbaeb88d9e701c.tar.bz2 cuberite-4f17362aeb80e5339c58a5d3b0fbaeb88d9e701c.tar.lz cuberite-4f17362aeb80e5339c58a5d3b0fbaeb88d9e701c.tar.xz cuberite-4f17362aeb80e5339c58a5d3b0fbaeb88d9e701c.tar.zst cuberite-4f17362aeb80e5339c58a5d3b0fbaeb88d9e701c.zip | |
Diffstat (limited to '')
| -rw-r--r-- | WebServer/Globals.h | 5 | ||||
| -rw-r--r-- | WebServer/Socket.h | 15 |
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};
|