From 4f17362aeb80e5339c58a5d3b0fbaeb88d9e701c Mon Sep 17 00:00:00 2001
From: "madmaxoft@gmail.com"
 <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>
Date: Mon, 13 Feb 2012 21:47:03 +0000
Subject: Rewritten most of the code for multithreading; still not 100%, but
 getting there. If this commit proves to be too problematic, we can always
 undo it.

git-svn-id: http://mc-server.googlecode.com/svn/trunk@251 0a769ca7-a7f5-676a-18bf-c427514a06d6
---
 WebServer/Globals.h |  5 +++++
 WebServer/Socket.h  | 15 ++++++++++-----
 2 files changed, 15 insertions(+), 5 deletions(-)

(limited to 'WebServer')

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};
 
-- 
cgit v1.2.3