Merge pull request #786 from lygstate/windows-h

Move include Windows.h into Cpp

Author: tmontgomery

sbe-benchmarks/src/main/cpp/benchlet-main.cpp

@@ -19,4 +19,23 @@ int main(int argc, char **argv)
 {
     BenchmarkRunner::run();
     return 0;
-}
+}
+
+#ifdef _WIN32
+#include <Windows.h>
+uint64_t BenchmarkRunner::currentTimestamp(void)
+{
+    static LARGE_INTEGER freq;
+    static int first = 1;
+    LARGE_INTEGER counter;
+
+    ::QueryPerformanceCounter(&counter);
+    if (1 == first)
+    {
+        ::QueryPerformanceFrequency(&freq);
+        first = 0;
+    }
+    return (1000000000 * counter.QuadPart)/freq.QuadPart;
+}
+
+#endif

sbe-benchmarks/src/main/cpp/benchlet.h

@@ -28,7 +28,6 @@
 #elif defined(__linux__)
 #   include <time.h>
 #elif defined(WIN32) || defined(_WIN32)
-#   include <windows.h>
 #else
 #   error "Must define Darwin or __linux__ or WIN32"
 #endif /* platform includes */
@@ -213,21 +212,7 @@ class BenchmarkRunner
         return end_timestamp - start_timestamp;
     };
 #elif defined(WIN32) || defined(_WIN32)
-    static uint64_t currentTimestamp(void)
-    {
-        static LARGE_INTEGER freq;
-        static int first = 1;
-        LARGE_INTEGER counter;
-
-        ::QueryPerformanceCounter(&counter);
-        if (1 == first)
-        {
-            ::QueryPerformanceFrequency(&freq);
-            first = 0;
-        }
-        return (1000000000 * counter.QuadPart)/freq.QuadPart;
-    }
-
+    static uint64_t currentTimestamp(void);
     static uint64_t elapsedNanoseconds(uint64_t start_timestamp, uint64_t end_timestamp)
     {
         return end_timestamp - start_timestamp;