From 16f92b290157b3af2a1037ca854832348b4ad015 Mon Sep 17 00:00:00 2001
From: "mtilden@gmail.com"
 <mtilden@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>
Date: Tue, 31 Jan 2012 05:37:59 +0000
Subject: Linux fixes, but while it compiles, when a user joins it crashes the
 server with "*** glibc detected *** ./MCServer: double free or corruption
 (out): 0x00007fb5f5158db0 ***"

Please look into this. Also, am I the only one compiling/using Linux?

git-svn-id: http://mc-server.googlecode.com/svn/trunk@198 0a769ca7-a7f5-676a-18bf-c427514a06d6
---
 WebServer/Socket.cpp |  1 +
 makefile             | 13 +++++++------
 source/cChunkMap.cpp |  1 +
 source/cWebAdmin.cpp |  1 +
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/WebServer/Socket.cpp b/WebServer/Socket.cpp
index e2a5179f3..1e9af902f 100644
--- a/WebServer/Socket.cpp
+++ b/WebServer/Socket.cpp
@@ -37,6 +37,7 @@
 #ifndef _WIN32
 #include <cstring>
 #include <sys/time.h>
+#define SD_SEND 0x01
 #else
 	#define MSG_NOSIGNAL (0)
 #endif
diff --git a/makefile b/makefile
index db7abd75b..3b286f906 100644
--- a/makefile
+++ b/makefile
@@ -506,6 +506,8 @@ clean :
 		build/cCriticalSection.o\
 		build/cEntity.o\
 		build/cEvent.o\
+		build/cEvents.o\
+		build/cFile.o\
 		build/cFurnaceEntity.o\
 		build/cFurnaceRecipe.o\
 		build/cFurnaceWindow.o\
@@ -757,6 +759,11 @@ build/cEntity.o : source/cEntity.cpp
 build/cEvent.o : source/cEvent.cpp
 	$(CC) $(CC_OPTIONS) source/cEvent.cpp -c $(INCLUDE) -o build/cEvent.o
 
+build/cEvents.o : WebServer/cEvents.cpp
+	$(CC) $(CC_OPTIONS) WebServer/cEvents.cpp -c $(INCLUDE) -o build/cEvents.o
+
+build/cFile.o : source/cFile.cpp
+	$(CC) $(CC_OPTIONS) source/cFile.cpp -c $(INCLUDE) -o build/cFile.o
 
 # Item # 16 -- cFurnaceEntity --
 build/cFurnaceEntity.o : source/cFurnaceEntity.cpp
@@ -1521,10 +1528,4 @@ build/cPlugin_NewLua.o : source/cPlugin_NewLua.cpp
 build/cWebPlugin_Lua.o : source/cWebPlugin_Lua.cpp
 	$(CC) $(CC_OPTIONS) source/cWebPlugin_Lua.cpp -c $(INCLUDE) -o build/cWebPlugin_Lua.o	
 
-build/cEvents.o : webserver/cEvents.cpp
-	$(CC) $(CC_OPTIONS) webserver/cEvents.cpp -c $(INCLUDE) -o build/cEvents.o
-
-build/cFile.o : source/cFile.cpp
-	$(CC) $(CC_OPTIONS) source/cFile.cpp -c $(INCLUDE) -o build/cFile.o
-
 ##### END RUN ####
diff --git a/source/cChunkMap.cpp b/source/cChunkMap.cpp
index d3dba0510..4e9fd5c62 100644
--- a/source/cChunkMap.cpp
+++ b/source/cChunkMap.cpp
@@ -11,6 +11,7 @@
 #ifndef _WIN32
 	#include <cstring> // memcpy
 	#include <cstdlib> // abs
+	#include <memory> // auto_ptr
 #endif
 
 #include "zlib.h"
diff --git a/source/cWebAdmin.cpp b/source/cWebAdmin.cpp
index 005a85424..002505c1f 100644
--- a/source/cWebAdmin.cpp
+++ b/source/cWebAdmin.cpp
@@ -21,6 +21,7 @@
 	#include <psapi.h>
 #else
 	#include <sys/resource.h>
+	#include <memory> // auto_ptr
 #endif
 
 
-- 
cgit v1.2.3