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
This commit is contained in:
matlabbe
2014-10-03 01:40:17 +00:00
parent 61603cdf0f
commit d30c2baf51
14 changed files with 44 additions and 44 deletions

View File

@@ -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_)