summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormtilden@gmail.com <mtilden@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2012-01-31 06:37:59 +0100
committermtilden@gmail.com <mtilden@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2012-01-31 06:37:59 +0100
commit16f92b290157b3af2a1037ca854832348b4ad015 (patch)
tree27fe428a047729d04707fc6e884a78b16c9ddc7b
parentCan now receive POST data in WebPlugins! (diff)
downloadcuberite-16f92b290157b3af2a1037ca854832348b4ad015.tar
cuberite-16f92b290157b3af2a1037ca854832348b4ad015.tar.gz
cuberite-16f92b290157b3af2a1037ca854832348b4ad015.tar.bz2
cuberite-16f92b290157b3af2a1037ca854832348b4ad015.tar.lz
cuberite-16f92b290157b3af2a1037ca854832348b4ad015.tar.xz
cuberite-16f92b290157b3af2a1037ca854832348b4ad015.tar.zst
cuberite-16f92b290157b3af2a1037ca854832348b4ad015.zip
Diffstat (limited to '')
-rw-r--r--WebServer/Socket.cpp1
-rw-r--r--makefile13
-rw-r--r--source/cChunkMap.cpp1
-rw-r--r--source/cWebAdmin.cpp1
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