Merged the composable_generator branch into the trunk

git-svn-id: http://mc-server.googlecode.com/svn/trunk@504 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-05-25 07:18:52 +00:00
parent 5f29a3e134
commit a4a418a679
82 changed files with 5422 additions and 2961 deletions
--- a/WebServer/Socket.cpp
+++ b/WebServer/Socket.cpp
@@ -37,6 +37,7 @@
 #ifndef _WIN32
 	#include <cstring>
 	#include <sys/time.h>
+	#include <unistd.h>
 	#define SD_SEND 0x01
 #else
 	#define MSG_NOSIGNAL (0)