Merge branch 'master' into small_stage_cleanup

Conflicts:
	common/EQStream.cpp
	zone/client.h

common/CMakeLists.txt

@@ -313,7 +313,6 @@ INCLUDE_DIRECTORIES(Patches SocketLib StackWalker TinyXML)
 
 ADD_LIBRARY(Common ${common_sources} ${common_headers})
 
-
 IF(UNIX)
 	ADD_DEFINITIONS(-fPIC)
 	SET_SOURCE_FILES_PROPERTIES("patches/SoD.cpp" "patches/SoF.cpp" "patches/RoF.cpp" "patches/Underfoot.cpp" PROPERTIES COMPILE_FLAGS -O0)

common/EQStream.cpp

@@ -39,10 +39,6 @@
 
 #ifdef _WINDOWS
 	#include <time.h>
-	// have to undefine these since a macro version 
-	// is defined in windef.h (which windows includes)
-	#undef min 
-	#undef max
 #else
 	#include <sys/types.h>
 	#include <sys/socket.h>
@@ -573,7 +569,7 @@ uint32 length;
 
 		while (used<length) {
 			out=new EQProtocolPacket(OP_Fragment,nullptr,MaxLen-4);
-			chunksize= std::min(length-used,MaxLen-6);
+			chunksize=std::min(length-used,MaxLen-6);
 			memcpy(out->pBuffer+2,tmpbuff+used,chunksize);
 			out->size=chunksize+2;
 			SequencedPush(out);

common/StringUtil.h

@@ -29,16 +29,16 @@ const char *MakeLowerString(const char *source);
 void MakeLowerString(const char *source, char *target);
 
 
-int		MakeAnyLenString(char** ret, const char* format, ...);
-uint32	AppendAnyLenString(char** ret, uint32* bufsize, uint32* strlen, const char* format, ...);
+int MakeAnyLenString(char** ret, const char* format, ...);
+uint32 AppendAnyLenString(char** ret, uint32* bufsize, uint32* strlen, const char* format, ...);
 
-uint32	hextoi(char* num);
-uint64	hextoi64(char* num);
-bool	atobool(char* iBool);
+uint32 hextoi(char* num);
+uint64 hextoi64(char* num);
+bool atobool(char* iBool);
 
-char*	strn0cpy(char* dest, const char* source, uint32 size);
+char* strn0cpy(char* dest, const char* source, uint32 size);
 		// return value =true if entire string(source) fit, false if it was truncated
-bool	strn0cpyt(char* dest, const char* source, uint32 size);
+bool strn0cpyt(char* dest, const char* source, uint32 size);
 
 char *CleanMobName(const char *in, char *out);
 

common/debug.cpp

@@ -1,7 +1,6 @@
 #include <iostream>
 #include <string>
 #include <cstdarg>
-
 #include <time.h>
 
 #ifdef _WINDOWS

common/rdtsc.cpp

@@ -58,7 +58,7 @@ RDTSC_Timer::RDTSC_Timer(bool start_it) {
 }
 
 int64 RDTSC_Timer::rdtsc() {
-	int64 res;
+	int64 res = 0;
 #ifdef USE_RDTSC
 #ifndef WIN64
 #ifdef WIN32