Changed WIN32 to _WIN32 to handle some 64bits systems where WIN32 is not defined (_WIN32 should be defined both for 32bits and 64bits systems: http://msdn.microsoft.com/en-us/library/b0084kay.aspx).

git-svn-id: http://rtabmap.googlecode.com/svn/trunk/rtabmap@1830 f169173b-cf89-36c8-b27e-44dbe73f0c83

utilite/src/UConversion.cpp

@@ -23,7 +23,7 @@
 #include <string.h>
 #include <stdio.h>
 
-#ifdef WIN32
+#ifdef _WIN32
 #include <windows.h>
 #endif
 
@@ -262,7 +262,7 @@ std::string uFormatv (const char *fmt, va_list args)
     va_list argsTmp;
 
     while (1) {
-#if defined(WIN32) && !defined(__MINGW32__)
+#if defined(_WIN32) && !defined(__MINGW32__)
 	argsTmp = args;
 #else
 	va_copy(argsTmp, args);
@@ -299,7 +299,7 @@ std::string uFormat (const char *fmt, ...)
     return buf;
 }
 
-#ifdef WIN32
+#ifdef _WIN32
 // returned whar_t * must be deleted : delete [] wText;
 wchar_t * createWCharFromChar(const char * text)
 {

utilite/src/UDirectory.cpp

@@ -19,7 +19,7 @@
 
 #include "rtabmap/utilite/UDirectory.h"
 
-#ifdef WIN32
+#ifdef _WIN32
   #include <Windows.h>
   #include <direct.h>
   #include <algorithm>
@@ -42,7 +42,7 @@
 
 #include "rtabmap/utilite/ULogger.h"
 
-#ifdef WIN32
+#ifdef _WIN32
 
 bool sortCallback(const std::string & a, const std::string & b)
 {
@@ -118,7 +118,7 @@ void UDirectory::update()
 			endOfDir = true;
 		}
 		fileNames_.clear();
-#ifdef WIN32
+#ifdef _WIN32
 		WIN32_FIND_DATA fileInformation;
 	#ifdef UNICODE
 		wchar_t * pathAll = createWCharFromChar((path_+"\\*").c_str());
@@ -300,7 +300,7 @@ std::string UDirectory::currentDir(bool trailingSeparator)
 	std::string dir;
 	char * buffer;
 
-#ifdef WIN32
+#ifdef _WIN32
 	buffer = _getcwd(NULL, 0);
 #else
 	buffer = getcwd(NULL, MAXPATHLEN);
@@ -364,7 +364,7 @@ std::string UDirectory::homeDir()
 
 std::string UDirectory::separator()
 {
-#ifdef WIN32
+#ifdef _WIN32
 	return "\\";
 #else
 	return "/";

utilite/src/ULogger.cpp

@@ -26,11 +26,11 @@
 #include <string>
 #include <string.h>
 
-#ifndef WIN32
+#ifndef _WIN32
 #include <sys/time.h>
 #endif
 
-#ifdef WIN32
+#ifdef _WIN32
 #include <Windows.h>
 #define COLOR_NORMAL FOREGROUND_BLUE | FOREGROUND_GREEN | FOREGROUND_RED
 #define COLOR_RED FOREGROUND_RED | FOREGROUND_INTENSITY
@@ -331,7 +331,7 @@ void ULogger::write(ULogger::Level level,
 
     if(level >= level_)
     {
-#ifdef WIN32
+#ifdef _WIN32
     	int color = 0;
 #else
     	const char* color = NULL;
@@ -427,12 +427,12 @@ void ULogger::write(ULogger::Level level,
 		if(type_ != kTypeNoLog)
 		{
 			va_start(args, msg);
-#ifdef WIN32
+#ifdef _WIN32
 			HANDLE H = GetStdHandle(STD_OUTPUT_HANDLE);
 #endif
 			if(type_ == ULogger::kTypeConsole && printColored_)
 			{
-#ifdef WIN32
+#ifdef _WIN32
 				SetConsoleTextAttribute(H,color);
 #else
 				if(buffered_)
@@ -462,7 +462,7 @@ void ULogger::write(ULogger::Level level,
 			}
 			if(type_ == ULogger::kTypeConsole && printColored_)
 			{
-#ifdef WIN32
+#ifdef _WIN32
 				SetConsoleTextAttribute(H,COLOR_NORMAL);
 #else
 				if(buffered_)

utilite/src/UProcessInfo.cpp

@@ -19,7 +19,7 @@
 
 #include "rtabmap/utilite/UProcessInfo.h"
 
-#ifdef WIN32
+#ifdef _WIN32
 #include "Windows.h"
 #include "Psapi.h"
 #elif __APPLE__
@@ -39,7 +39,7 @@ long int UProcessInfo::getMemoryUsage()
 {
 	long int memoryUsage = -1;
 
-#ifdef WIN32
+#ifdef _WIN32
 		HANDLE hProc = GetCurrentProcess();
 		PROCESS_MEMORY_COUNTERS info;
 		BOOL okay = GetProcessMemoryInfo(hProc, &info, sizeof(info));

utilite/src/UThread.cpp

@@ -163,7 +163,7 @@ void UThread::applyPriority()
 {
     if(handle_)
     {
-#ifdef WIN32
+#ifdef _WIN32
         int p = THREAD_PRIORITY_NORMAL;
         switch(priority_)
         {
@@ -209,7 +209,7 @@ void UThread::applyAffinity()
 {
 	if(cpuAffinity_>0)
 	{
-#ifdef WIN32
+#ifdef _WIN32
 #elif __APPLE__
 		thread_affinity_policy_data_t affPolicy;
 		affPolicy.affinity_tag = cpuAffinity_;

utilite/src/UTimer.cpp

@@ -25,7 +25,7 @@
 ///////////////////////
 UTimer::UTimer()
 {
-#ifdef WIN32
+#ifdef _WIN32
     QueryPerformanceFrequency(&frequency_);
 #endif
     start(); // This will initialize the private counters
@@ -33,7 +33,7 @@ UTimer::UTimer()
 
 UTimer::~UTimer() {}
 
-#ifdef WIN32
+#ifdef _WIN32
 double UTimer::now()
 {
     LARGE_INTEGER count, freq;