From 4ffdd95f877b387d18cb6332b0132ef6f8056840 Mon Sep 17 00:00:00 2001
From: "Ding, Wei (xN/A) TX" <Wei.Ding2@amd.com>
Date: Tue, 24 Mar 2015 13:48:22 -0500
Subject: [PATCH] ECR #333755 - Fixed error for not finding intrin.h under
 linux.

[git-p4: depot-paths = "//depot/stg/hsa/drivers/hsa/runtime/": change = 1133886]


[ROCm/ROCR-Runtime commit: b58ee3f9b7f2d406cae5c85321db54172e19052c]
---
 projects/rocr-runtime/samples/common/hsatimer.h | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/projects/rocr-runtime/samples/common/hsatimer.h b/projects/rocr-runtime/samples/common/hsatimer.h
index a15b06f583..2b7de9ed7e 100644
--- a/projects/rocr-runtime/samples/common/hsatimer.h
+++ b/projects/rocr-runtime/samples/common/hsatimer.h
@@ -2,21 +2,27 @@
 #define __MYTIME__
 
 // Will use AMD timer and general Linux timer based on users' need --> compilation flag
-
 // need to consider platform is Windows or Linux
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdint.h>
-#include <x86intrin.h>
 #include <string.h>
-
 #include <iostream>
 #include <vector>
 #include <string>
 using namespace std;
 
-#include <sys/time.h>
+#if defined(_MSC_VER)
+  #include <time.h>
+  #include <windows.h>
+  #include <intrin.h>
+#else
+  #if defined(__GNUC__)
+    #include <sys/time.h>
+    #include <x86intrin.h>
+  #endif // __GNUC__
+#endif //_MSC_VER
 
 #define HSA_FAILURE  1
 #define HSA_SUCCESS 0