Merge branch 'master' into develop

server/server_utilities/makefile

@@ -30,8 +30,3 @@ $(OUTDIR):
 
 $(OBJDIR)/%.o: %.cpp
 	$(CXX) $(CXXFLAGS) -c -o $@ $<
-
-clean:
-	$(RM) *.o *.a *.exe
-
-rebuild: clean all

server/server_utilities/network_api.cpp

@@ -25,6 +25,8 @@
 #include "character_manager.hpp"
 #include "server_utilities.hpp"
 
+#include <cstring>
+
 static int pumpCharacterUpdate(lua_State* L) {
 	CharacterData* characterData = static_cast<CharacterData*>(lua_touserdata(L, 1));
 

server/server_utilities/server_utilities.cpp

@@ -27,6 +27,8 @@
 #include "room_manager.hpp"
 #include "udp_network_utility.hpp"
 
+#include <cstring>
+
 //-------------------------
 //manager unload functions
 //-------------------------