From 0774fe35b0b22be551d554714cb9658d8d1b4c04 Mon Sep 17 00:00:00 2001
From: "Ding, Wei (xN/A) TX" <Wei.Ding2@amd.com>
Date: Tue, 24 Mar 2015 11:19:53 -0500
Subject: [PATCH] ECR #333755 - Fixed a compilation problem under windows.

[git-p4: depot-paths = "//depot/stg/hsa/drivers/hsa/runtime/": change = 1133835]
---
 samples/common/hsatimer.h | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

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