First pass in cleaning up instance.

[awesomized/libmemcached] / libtest / timer.hpp

diff --git a/libtest/timer.hpp b/libtest/timer.hpp
index 73de26c6ac2361168cdf7974180cd32d4fa3c5e1..28ec47416766c3eb917447d527a57ef1e0e47e97 100644 (file)
--- a/libtest/timer.hpp
+++ b/libtest/timer.hpp
@@ -114,9 +114,7 @@ public:
 private:
   void _time(struct timespec& ts)
   {
-#if defined(HAVE_CLOCK_GETTIME) && HAVE_CLOCK_GETTIME
-    clock_gettime(CLOCK_REALTIME, &ts);
-#elif defined(__MACH__) && __MACH__ // OSX lacks clock_gettime()
+#ifdef __MACH__ // OSX lacks clock_gettime()
     clock_serv_t _clock_serv;
     mach_timespec_t _mach_timespec;
     host_get_clock_service(mach_host_self(), CALENDAR_CLOCK, &_clock_serv);
@@ -125,6 +123,7 @@ private:
     ts.tv_sec= _mach_timespec.tv_sec;
     ts.tv_nsec= _mach_timespec.tv_nsec;
 #else
+    clock_gettime(CLOCK_REALTIME, &ts);
 #endif
   }