Use more reliable Windows macro: WIN32 --> _WIN32

dartsim · Aug 11, 2015 · 6118b37 · 6118b37
1 parent 15dd9d1
commit 6118b37
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 23 deletions.
diff --git a/dart/common/Timer.cpp b/dart/common/Timer.cpp
@@ -55,7 +55,7 @@ Timer::Timer(const std::string& _name)
     mName(_name),
     mIsStarted(false)
 {
-#if WIN32
+#ifdef _WIN32
   mTimer.start.QuadPart = 0;
   mTimer.stop.QuadPart = 0;
   QueryPerformanceFrequency(&mFrequency);
@@ -71,7 +71,7 @@ Timer::~Timer()
 }
 
 //==============================================================================
-#if WIN32
+#ifdef _WIN32
 double Timer::_convLIToSecs(const LARGE_INTEGER& _L)
 {
   return (static_cast<double>(_L.QuadPart)
@@ -84,7 +84,7 @@ void Timer::start()
 {
   mIsStarted = true;
   mCount++;
-#if WIN32
+#ifdef _WIN32
   QueryPerformanceCounter(&mTimer.start);
 #else
   gettimeofday(&mTimeVal, nullptr);
@@ -96,7 +96,7 @@ void Timer::start()
 void Timer::stop()
 {
   mIsStarted = false;
-#if WIN32
+#ifdef _WIN32
   QueryPerformanceCounter(&mTimer.stop);
   LARGE_INTEGER time;
   time.QuadPart = mTimer.stop.QuadPart - mTimer.start.QuadPart;
@@ -112,7 +112,7 @@ void Timer::stop()
 //==============================================================================
 double Timer::getElapsedTime()
 {
-#if WIN32
+#ifdef _WIN32
   LARGE_INTEGER timenow;
   QueryPerformanceCounter(&timenow);
   LARGE_INTEGER time;
@@ -166,7 +166,7 @@ void Timer::print()
 //==============================================================================
 double Timer::getWallTime()
 {
-#if WIN32
+#ifdef _WIN32
   LARGE_INTEGER ticksPerSecond;
   LARGE_INTEGER ticks;
   QueryPerformanceFrequency(&ticksPerSecond);

diff --git a/dart/common/Timer.h b/dart/common/Timer.h
@@ -39,7 +39,7 @@
 
 #include <string>
 
-#if WIN32
+#ifdef _WIN32
   #ifdef NOMINMAX
     #include <windows.h>
   #else
@@ -100,7 +100,7 @@ class Timer
 private:
   int mCount;
 
-#if WIN32
+#ifdef _WIN32
   stopWatch mTimer;
 #else
   timeval mTimeVal;
@@ -113,7 +113,7 @@ class Timer
   std::string mName;
   bool mIsStarted;
 
-#if WIN32
+#ifdef _WIN32
   LARGE_INTEGER  mFrequency;
   double _convLIToSecs(const LARGE_INTEGER& _L);
 #endif

diff --git a/dart/gui/GlutWindow.cpp b/dart/gui/GlutWindow.cpp
@@ -37,7 +37,7 @@
 
 #include "dart/gui/GlutWindow.h"
 
-#ifndef WIN32
+#ifndef _WIN32
   #include <dirent.h>
 #endif
 #include <cstdio>
@@ -153,7 +153,7 @@ bool GlutWindow::screenshot() {
   char fileBase[32] = "frames/Capture";
   char fileName[64];
   // png
-#ifdef WIN32
+#ifdef _WIN32
   _snprintf(fileName, sizeof(fileName), "%s%.4d.png", fileBase, count++);
 #else
   std::snprintf(fileName, sizeof(fileName), "%s%.4d.png", fileBase, count++);

diff --git a/dart/gui/GraphWindow.cpp b/dart/gui/GraphWindow.cpp
@@ -91,7 +91,7 @@ void GraphWindow::draw() {
   while (xPos < 1.0) {
     char buff[64];
     int v = xPos * nPoints;
-#ifdef WIN32
+#ifdef _WIN32
     _snprintf(buff, sizeof(buff), "%d", v);
 #else
     std::snprintf(buff, sizeof(buff), "%d", v);
@@ -106,7 +106,7 @@ void GraphWindow::draw() {
   while (yPos < 1.0) {
     char buff[64];
     double v = yPos * (upperBound - lowerBound) + lowerBound;
-#ifdef WIN32
+#ifdef _WIN32
     _snprintf(buff, sizeof(buff), "%.2e", v);
 #else
     std::snprintf(buff, sizeof(buff), "%.2e", v);

diff --git a/dart/gui/LoadGlut.h b/dart/gui/LoadGlut.h
@@ -37,7 +37,7 @@
 #ifndef DART_GUI_LOADGLUT_H_
 #define DART_GUI_LOADGLUT_H_
 
-#if WIN32
+#ifdef _WIN32
   #include <cstdlib> // To disable glut::exit() function
   #include <GL/glut.h>
 #elif defined(__linux__)

diff --git a/dart/gui/SimWindow.cpp b/dart/gui/SimWindow.cpp
@@ -163,13 +163,13 @@ void SimWindow::draw() {
   // display the frame count in 2D text
   char buff[64];
   if (!mSimulating)
-#ifdef WIN32
+#ifdef _WIN32
     _snprintf(buff, sizeof(buff), "%d", mPlayFrame);
 #else
     std::snprintf(buff, sizeof(buff), "%d", mPlayFrame);
 #endif
   else
-#ifdef WIN32
+#ifdef _WIN32
     _snprintf(buff, sizeof(buff), "%d", mWorld->getSimFrames());
 #else
     std::snprintf(buff, sizeof(buff), "%d", mWorld->getSimFrames());

diff --git a/dart/lcpsolver/error.cpp b/dart/lcpsolver/error.cpp
@@ -81,7 +81,7 @@ static void printMessage (int num, const char *msg1, const char *msg2,
 //****************************************************************************
 // unix
 
-#ifndef WIN32
+#ifndef _WIN32
 
 extern "C" void dError (int num, const char *msg, ...)
 {
@@ -117,7 +117,7 @@ extern "C" void dMessage (int num, const char *msg, ...)
 //****************************************************************************
 // windows
 
-#ifdef WIN32
+#ifdef _WIN32
 
 // isn't cygwin annoying!
 #ifdef CYGWIN

diff --git a/dart/math/Helpers.h b/dart/math/Helpers.h
@@ -153,7 +153,7 @@ inline bool isInt(double _x) {
 
 /// \brief Returns whether _v is a NaN (Not-A-Number) value
 inline bool isNan(double _v) {
-#ifdef WIN32
+#ifdef _WIN32
   return _isnan(_v);
 #else
   return std::isnan(_v);
@@ -173,7 +173,7 @@ inline bool isNan(const Eigen::MatrixXd& _m) {
 /// \brief Returns whether _v is an infinity value (either positive infinity or
 /// negative infinity).
 inline bool isInf(double _v) {
-#ifdef WIN32
+#ifdef _WIN32
   return !_finite(_v);
 #else
   return std::isinf(_v);

diff --git a/dart/renderer/LoadOpengl.h b/dart/renderer/LoadOpengl.h
@@ -37,7 +37,7 @@
 #ifndef DART_RENDERER_LOADOPENGL_H_
 #define DART_RENDERER_LOADOPENGL_H_
 
-#if WIN32
+#ifdef _WIN32
   #ifdef NOMINMAX
     #include <windows.h>
   #else

diff --git a/unittests/testCommon.cpp b/unittests/testCommon.cpp
@@ -51,7 +51,7 @@ TEST(Common, Timer)
   for (int i = 0; i < 1e+3; ++i)
   {
     timer2.start();
-#ifdef WIN32
+#ifdef _WIN32
 	Sleep(2);  // 2 milliseconds
 #else
 	usleep(2000);  // 2 milliseconds
@@ -64,7 +64,7 @@ TEST(Common, Timer)
   timer2.print();
 
   // Both timer should have counted more than 2 seconds
-#ifdef WIN32
+#ifdef _WIN32
   // On Windows, Sleep(2) takes less than exact 2 milliseconds..
   EXPECT_GE(timer1.getTotalElapsedTime(), 1.99);
   EXPECT_GE(timer2.getTotalElapsedTime(), 1.99);