flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Linux fixes, but while it compiles, when a user joins it crashes the server with "*** glibc detected *** ./MCServer: double free or corruption (out): 0x00007fb5f5158db0 ***"

Browse Source 
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
This commit is contained in:
mtilden@gmail.com 2012-01-31 05:37:59 +00:00
parent c142424571
commit 16f92b2901
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
WebServer/Socket.cpp
View File

@ -37,6 +37,7 @@
#ifndef _WIN32 #ifndef _WIN32
#include <cstring> #include <cstring>
#include <sys/time.h> #include <sys/time.h>
#define SD_SEND 0x01
#else #else
#define MSG_NOSIGNAL (0) #define MSG_NOSIGNAL (0)
#endif #endif

13
makefile
View File

@ -506,6 +506,8 @@ clean :
build/cCriticalSection.o\ build/cCriticalSection.o\
build/cEntity.o\ build/cEntity.o\
build/cEvent.o\ build/cEvent.o\
build/cEvents.o\
build/cFile.o\
build/cFurnaceEntity.o\ build/cFurnaceEntity.o\
build/cFurnaceRecipe.o\ build/cFurnaceRecipe.o\
build/cFurnaceWindow.o\ build/cFurnaceWindow.o\
@ -757,6 +759,11 @@ build/cEntity.o : source/cEntity.cpp
build/cEvent.o : source/cEvent.cpp build/cEvent.o : source/cEvent.cpp
$(CC) $(CC_OPTIONS) source/cEvent.cpp -c $(INCLUDE) -o build/cEvent.o $(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 -- # Item # 16 -- cFurnaceEntity --
build/cFurnaceEntity.o : source/cFurnaceEntity.cpp 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 build/cWebPlugin_Lua.o : source/cWebPlugin_Lua.cpp
$(CC) $(CC_OPTIONS) source/cWebPlugin_Lua.cpp -c $(INCLUDE) -o build/cWebPlugin_Lua.o $(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 #### ##### END RUN ####

1
source/cChunkMap.cpp
View File

@ -11,6 +11,7 @@
#ifndef _WIN32 #ifndef _WIN32
#include <cstring> // memcpy #include <cstring> // memcpy
#include <cstdlib> // abs #include <cstdlib> // abs
#include <memory> // auto_ptr
#endif #endif
#include "zlib.h" #include "zlib.h"

1
source/cWebAdmin.cpp
View File

@ -21,6 +21,7 @@
#include <psapi.h> #include <psapi.h>
#else #else
#include <sys/resource.h> #include <sys/resource.h>
#include <memory> // auto_ptr
#endif #endif