[ZH] Fix misc and header include errors for Zero Hour Tools build (TheSuperHackers#509)

Author: xezon

GeneralsMD/Code/Tools/Autorun/autorun.cpp

@@ -87,7 +87,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
-#include <strstrea.h>
 #include <sys/stat.h>
 #include <time.h>
 #include <winuser.h>

GeneralsMD/Code/Tools/PATCHGET/CHATAPI.CPP

@@ -31,7 +31,9 @@
 #include <windows.h>
 #include <initguid.h>
 #include <olectl.h>
+#if defined(_MSC_VER) && _MSC_VER < 1300
 #include <mapicode.h>
+#endif
 #include "RESOURCE.H"
 #include "WINBLOWS.H"
 #include <crtdbg.h>

GeneralsMD/Code/Tools/mangler/wlib/dictionary.h

@@ -44,6 +44,7 @@ your hashing function is good.
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>
+#include <crtdbg.h>
 
 #include "wstypes.h"
 

GeneralsMD/Code/Tools/matchbot/wlib/dictionary.h

@@ -44,6 +44,7 @@ your hashing function is good.
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>
+#include <crtdbg.h>
 
 #include "wstypes.h"
 

GeneralsMD/Code/Tools/wolSetup/WOLAPI/wolapi.h

@@ -433,7 +433,9 @@ void __RPC_STUB IRTPatcherEvent_OnTermination_Stub(
 /* interface IChat */
 /* [object][unique][helpstring][uuid] */ 
 
+#if defined(_MSC_VER) && _MSC_VER < 1300
 typedef long time_t;
+#endif
 
 typedef 
 enum Locale

GeneralsMD/Code/Tools/wolSetup/wolSetup.h

@@ -39,7 +39,8 @@ extern char g_wolapiRealFilename[MAX_PATH];
 extern char g_generalsFilename[MAX_PATH];
 extern char g_generalsSerial[];
 
-static MAJOR(unsigned long x) { return (((x) & 0xffff0000) >> 16); }
-static MINOR(unsigned long x) { return ((x) & 0xffff); }
+// TheSuperHackers @todo Check if this should be returning unsigned long.
+static int MAJOR(unsigned long x) { return (((x) & 0xffff0000) >> 16); }
+static int MINOR(unsigned long x) { return ((x) & 0xffff); }
 
 #endif // __WOLSETUP_H__