From d61acbe46f9e4814d08e40ff0b9ac912176dc869 Mon Sep 17 00:00:00 2001 From: Hib Eris Date: Wed, 30 Jun 2010 16:15:06 +0200 Subject: [PATCH 3/7] [win32] Check for _WIN32 instead of _MSC_VER --- goo/GooTimer.cc | 6 +++--- goo/GooTimer.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/goo/GooTimer.cc b/goo/GooTimer.cc index 769fd63..0f4ccfe 100644 --- a/goo/GooTimer.cc +++ b/goo/GooTimer.cc @@ -32,7 +32,7 @@ GooTimer::GooTimer() { void GooTimer::start() { #ifdef HAVE_GETTIMEOFDAY gettimeofday(&start_time, NULL); -#elif defined(_MSC_VER) +#elif defined(_WIN32) QueryPerformanceCounter(&start_time); #endif active = true; @@ -41,7 +41,7 @@ void GooTimer::start() { void GooTimer::stop() { #ifdef HAVE_GETTIMEOFDAY gettimeofday(&end_time, NULL); -#elif defined(_MSC_VER) +#elif defined(_WIN32) QueryPerformanceCounter(&end_time); #endif active = false; @@ -70,7 +70,7 @@ double GooTimer::getElapsed() return total; } -#elif defined(_MSC_VER) +#elif defined(_WIN32) double GooTimer::getElapsed() { LARGE_INTEGER freq; diff --git a/goo/GooTimer.h b/goo/GooTimer.h index f03413c..864bf68 100755 --- a/goo/GooTimer.h +++ b/goo/GooTimer.h @@ -22,7 +22,7 @@ #include #endif -#ifdef _MSC_VER +#ifdef _WIN32 #include #endif @@ -44,7 +44,7 @@ private: #ifdef HAVE_GETTIMEOFDAY struct timeval start_time; struct timeval end_time; -#elif defined(_MSC_VER) +#elif defined(_WIN32) LARGE_INTEGER start_time; LARGE_INTEGER end_time; #endif -- 1.6.4.2