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/include/rtabmap/utilite/UConversion.h

@@ -236,7 +236,7 @@ std::string UTILITE_EXP uFormatv (const char *fmt, va_list ap);
  */
 std::string UTILITE_EXP uFormat (const char *fmt, ...);
 
-#ifdef WIN32
+#ifdef _WIN32
 /**
  * Convert multi-byte string to unicode (wide-char) string.
  * Note that returned whar_t * must be deleted : delete [] wText;

utilite/include/rtabmap/utilite/UMutex.h

@@ -22,7 +22,7 @@
 
 #include <errno.h>
 
-#ifdef WIN32
+#ifdef _WIN32
   #include "rtabmap/utilite/Win32/UWin32.h"
 #else
   #include <pthread.h>
@@ -61,7 +61,7 @@ public:
 	 */
 	UMutex()
 	{
-#ifdef WIN32
+#ifdef _WIN32
 		InitializeCriticalSection(&C);
 #else
 		pthread_mutexattr_t attr;
@@ -74,7 +74,7 @@ public:
 
 	virtual ~UMutex()
 	{
-#ifdef WIN32
+#ifdef _WIN32
 		DeleteCriticalSection(&C);
 #else
 		pthread_mutex_unlock(&M); pthread_mutex_destroy(&M);
@@ -86,14 +86,14 @@ public:
 	 */
 	int lock() const
 	{
-#ifdef WIN32
+#ifdef _WIN32
 		EnterCriticalSection(&C); return 0;
 #else
 		return pthread_mutex_lock(&M);
 #endif
 	}
 
-#ifdef WIN32
+#ifdef _WIN32
 	#if(_WIN32_WINNT >= 0x0400)
 	int lockTry() const
 	{
@@ -112,7 +112,7 @@ public:
 	 */
 	int unlock() const
 	{
-#ifdef WIN32
+#ifdef _WIN32
 		LeaveCriticalSection(&C); return 0;
 #else
 		return pthread_mutex_unlock(&M);
@@ -120,7 +120,7 @@ public:
 	}
 
 	private:
-#ifdef WIN32
+#ifdef _WIN32
 		mutable CRITICAL_SECTION C;
 #else
 		mutable pthread_mutex_t M;

utilite/include/rtabmap/utilite/USemaphore.h

@@ -27,7 +27,7 @@
 
 #include <errno.h>
 
-#ifdef WIN32
+#ifdef _WIN32
 #include "rtabmap/utilite/Win32/UWin32.h"
 #define SEM_VALUE_MAX ((int) ((~0u) >> 1))
 #else
@@ -59,7 +59,7 @@ public:
 	 */
 	USemaphore( int initValue = 0 )
 	{
-#ifdef WIN32
+#ifdef _WIN32
 		S = CreateSemaphore(0,initValue,SEM_VALUE_MAX,0);
 #else
 		_available = initValue;
@@ -70,7 +70,7 @@ public:
 
 	virtual ~USemaphore()
 	{
-#ifdef WIN32
+#ifdef _WIN32
 		CloseHandle(S);
 #else
 		pthread_cond_destroy(&_cond);
@@ -84,7 +84,7 @@ public:
 	 * @see release()
 	 * @param n number to acquire
 	 */
-#ifdef WIN32
+#ifdef _WIN32
 	void acquire(int n = 1) const
 	{
 		while(n-- > 0)
@@ -112,7 +112,7 @@ public:
 	 * Try to acquire the semaphore, not a blocking call.
 	 * @return false if the semaphore can't be taken without waiting (value <= 0), true otherwise
 	 */
-#ifdef WIN32
+#ifdef _WIN32
 	int acquireTry() const
 	{
 		return ((WaitForSingleObject((HANDLE)S,INFINITE)==WAIT_OBJECT_0)?0:EAGAIN);
@@ -135,7 +135,7 @@ public:
 	 * Release the semaphore, increasing its value by 1 and
 	 * signaling waiting threads (which called acquire()).
 	 */
-#ifdef WIN32
+#ifdef _WIN32
 	int release(int n = 1) const
 	{
 		return (ReleaseSemaphore((HANDLE)S,n,0)?0:ERANGE);
@@ -153,7 +153,7 @@ public:
 	 * Get the USempahore's value.
 	 * @return the semaphore's value
 	 */
-#ifdef WIN32
+#ifdef _WIN32
 	int value() const
 	{
 		LONG V = -1; ReleaseSemaphore((HANDLE)S,0,&V); return V;
@@ -168,7 +168,7 @@ public:
 #endif
 	}
 
-#ifdef WIN32
+#ifdef _WIN32
 	/*
 	 * Reset the semaphore count.
 	 * @param init the initial value
@@ -182,7 +182,7 @@ public:
 #endif
 
 private:
-#ifdef WIN32
+#ifdef _WIN32
 	HANDLE S;
 #else
 	pthread_mutex_t _waitMutex;

utilite/include/rtabmap/utilite/UThread.h

@@ -255,7 +255,7 @@ private:
     State state_; 			/* The thread state. */
     Priority priority_; 	/* The thread priority. */
     Handle handle_; 	/* The thread handle. */
-#ifdef WIN32
+#ifdef _WIN32
     int threadId_; 			/* The thread id. */
 #else
     unsigned long threadId_; /* The thread id. */

utilite/include/rtabmap/utilite/UThreadC.h

@@ -27,7 +27,7 @@
  * base form is not supported.
  * @see StateThread
  */
-#ifdef WIN32
+#ifdef _WIN32
   #include "rtabmap/utilite/Win32/UThreadC.h"
 #else
   #include "rtabmap/utilite/Posix/UThreadC.h"

utilite/include/rtabmap/utilite/UTimer.h

@@ -22,7 +22,7 @@
 
 #include "rtabmap/utilite/UtiLiteExp.h" // DLL export/import defines
 
-#ifdef WIN32
+#ifdef _WIN32
 #include <windows.h>
 #else
 #include <sys/time.h>
@@ -95,7 +95,7 @@ public:
     double ticks();
 
 private:
-#ifdef WIN32
+#ifdef _WIN32
     LARGE_INTEGER startTimeRecorded_; /* When we start the timer, timeRecorded is copied over lastTimeRecorded.*/
     LARGE_INTEGER stopTimeRecorded_;  /* When we stop the timer. */