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
This commit is contained in:
parent
c142424571
commit
16f92b2901
@ -37,6 +37,7 @@
|
||||
#ifndef _WIN32
|
||||
#include <cstring>
|
||||
#include <sys/time.h>
|
||||
#define SD_SEND 0x01
|
||||
#else
|
||||
#define MSG_NOSIGNAL (0)
|
||||
#endif
|
||||
|
13
makefile
13
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 ####
|
||||
|
@ -11,6 +11,7 @@
|
||||
#ifndef _WIN32
|
||||
#include <cstring> // memcpy
|
||||
#include <cstdlib> // abs
|
||||
#include <memory> // auto_ptr
|
||||
#endif
|
||||
|
||||
#include "zlib.h"
|
||||
|
@ -21,6 +21,7 @@
|
||||
#include <psapi.h>
|
||||
#else
|
||||
#include <sys/resource.h>
|
||||
#include <memory> // auto_ptr
|
||||
#endif
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user