From cecb0cc14a8d98184b632e699cc8877aabbc8af9 Mon Sep 17 00:00:00 2001
From: "Ding, Wei (xN/A) TX" <Wei.Ding2@amd.com>
Date: Tue, 24 Mar 2015 13:10:42 -0500
Subject: [PATCH] ECR #333755 - Revert to Linux version.

[git-p4: depot-paths = "//depot/stg/hsa/drivers/hsa/runtime/": change = 1133874]
---
 samples/common/hsatimer.h | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/samples/common/hsatimer.h b/samples/common/hsatimer.h
index be6e177ab2..a15b06f583 100644
--- a/samples/common/hsatimer.h
+++ b/samples/common/hsatimer.h
@@ -8,23 +8,15 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdint.h>
-#include <intrin.h>
+#include <x86intrin.h>
 #include <string.h>
+
 #include <iostream>
 #include <vector>
 #include <string>
 using namespace std;
 
-#if defined(__GNUC__)
-  #include <sys/time.h>
-  #include <x86intrin.h>
-#else
-  #if defined(_MSC_VER)
-    #include <time.h>
-    #include <windows.h>
-    #include <intrin.h>
-  #endif // _MSC_VER
-#endif // __GNUC__
+#include <sys/time.h>
 
 #define HSA_FAILURE  1
 #define HSA_SUCCESS 0