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
+5 -5
View File
@@ -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 "/";