- load of changes to get things compiling under VC++ 2010 (with updated deps seperate for vc2010)

source/shared_lib/sources/graphics/BMPReader.cpp

@@ -10,7 +10,7 @@
 // ==============================================================
 
 #include "BMPReader.h"
-#include "types.h"
+#include "data_types.h"
 #include "pixmap.h"
 #include <stdexcept>
 #include "util.h"

source/shared_lib/sources/graphics/JPGReader.cpp

@@ -12,7 +12,7 @@
 #include "JPGReader.h"
 #include "FileReader.h"
 
-#include "types.h"
+#include "data_types.h"
 #include "pixmap.h"
 #include <stdexcept>
 #include <jpeglib.h>

source/shared_lib/sources/graphics/PNGReader.cpp

@@ -11,7 +11,7 @@
 
 #include "PNGReader.h"
 
-#include "types.h"
+#include "data_types.h"
 #include "pixmap.h"
 #include <stdexcept>
 #include <png.h>

source/shared_lib/sources/graphics/TGAReader.cpp

@@ -10,7 +10,7 @@
 // ==============================================================
 
 #include "TGAReader.h"
-#include "types.h"
+#include "data_types.h"
 #include "pixmap.h"
 #include <stdexcept>
 #include <iostream>

source/shared_lib/sources/platform/common/platform_common.cpp

@@ -6,6 +6,12 @@
 //the terms of the GNU General Public License as published by the Free Software
 //Foundation; either version 2 of the License, or (at your option) any later
 //version.
+
+#ifdef WIN32
+  #include <winsock2.h>
+  #include <winsock.h>
+#endif
+
 #include "platform_common.h"
 #include "cache_manager.h"
 

source/shared_lib/sources/platform/posix/socket.cpp

@@ -29,6 +29,7 @@
 #ifdef WIN32
 
   #include <windows.h>
+  #include <winsock2.h>
   #include <winsock.h>
   #include <iphlpapi.h>
   #include <strstream>

source/shared_lib/sources/util/leak_dumper.cpp

@@ -11,6 +11,8 @@
 #include "leak_dumper.h"
 
 #ifdef SL_LEAK_DUMP
+#include "platform_util.h"
+#include <time.h>
 
 bool AllocInfo::application_binary_initialized = false;
 //static AllocRegistry memoryLeaks = AllocRegistry::getInstance();
@@ -30,14 +32,19 @@ AllocRegistry::~AllocRegistry() {
 
 void AllocRegistry::dump(const char *path) {
 #ifdef WIN32
-	FILE* f= = _wfopen(utf8_decode(path).c_str(), L"wt");
+	FILE* f= _wfopen(utf8_decode(path).c_str(), L"wt");
 #else
 	FILE *f= fopen(path, "wt");
 #endif
 	int leakCount=0;
 	size_t leakBytes=0;
 
-	fprintf(f, "Memory leak dump\n\n");
+	time_t debugTime = time(NULL);
+    struct tm *loctime = localtime (&debugTime);
+    char szBuf2[100]="";
+    strftime(szBuf2,100,"%Y-%m-%d %H:%M:%S",loctime);
+
+	fprintf(f, "Memory leak dump at: %s\n\n",szBuf2);
 
 	for(int i=0; i<maxAllocs; ++i){
 		AllocInfo &info = allocs[i];
@@ -58,7 +65,7 @@ void AllocRegistry::dump(const char *path) {
 
 	fclose(f);
 
-	printf("Memory leak dump summary:\n");
+	printf("Memory leak dump summary at: %s\n",szBuf2);
 	printf("Total leaks: %d, %lu bytes\n", leakCount, leakBytes);
 	printf("Total allocations: %d, %lu bytes\n", allocCount, allocBytes);
 	printf("Not monitored allocations: %d, %lu bytes\n", nonMonitoredCount, nonMonitoredBytes);

source/shared_lib/sources/xml/xml_parser.cpp

@@ -21,7 +21,7 @@
 #include <xercesc/util/PlatformUtils.hpp>
 #include <xercesc/framework/LocalFileFormatTarget.hpp>
 #include "util.h"
-#include "types.h"
+#include "data_types.h"
 #include "properties.h"
 #include "platform_common.h"
 #include "platform_util.h"