From 79dcda5116c8911782c646d923e14d7a9107e8c5 Mon Sep 17 00:00:00 2001
From: Xavi Zhang <xavi.zhang@amd.com>
Date: Thu, 7 May 2015 02:26:29 -0400
Subject: [PATCH] amdgpu/addrlib: add define HAVE_TSERVER

---
 src/amd/addrlib/addrtypes.h       | 10 +++++-----
 src/amd/addrlib/core/addrcommon.h |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/amd/addrlib/addrtypes.h b/src/amd/addrlib/addrtypes.h
index 4dd7babf004..fb8e706c759 100644
--- a/src/amd/addrlib/addrtypes.h
+++ b/src/amd/addrlib/addrtypes.h
@@ -33,8 +33,8 @@
 #ifndef __ADDR_TYPES_H__
 #define __ADDR_TYPES_H__
 
-#if defined(__APPLE__) || defined(TCORE_BUILD)
-// External definitions header maintained by Mac driver team (and TCORE team)
+#if defined(__APPLE__) && !defined(HAVE_TSERVER)
+// External definitions header maintained by Apple driver team, but not for diag team under Mac.
 // Helps address compilation issues & reduces code covered by NDA
 #include "addrExtDef.h"
 
@@ -59,7 +59,7 @@ typedef int            INT;
 
 #include <stdarg.h> // va_list...etc need this header
 
-#endif // defined (__APPLE__)
+#endif // defined (__APPLE__) && !defined(HAVE_TSERVER)
 
 /**
 ***************************************************************************************************
@@ -455,7 +455,7 @@ typedef enum _AddrTileType
 //
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#if !defined(__APPLE__)
+#if !defined(__APPLE__) || defined(HAVE_TSERVER)
 
 #ifndef BOOL_32        // no bool type in C
 /// @brief Boolean type, since none is defined in C
@@ -531,7 +531,7 @@ typedef enum _AddrTileType
 #define UINT_64  unsigned long long OR unsigned __int64
 #endif
 
-#endif // #if !defined(__APPLE__)
+#endif // #if !defined(__APPLE__) || defined(HAVE_TSERVER)
 
 //  ADDR64X is used to print addresses in hex form on both Windows and Linux
 //
diff --git a/src/amd/addrlib/core/addrcommon.h b/src/amd/addrlib/core/addrcommon.h
index 0dff0b8cc47..35320e60c18 100644
--- a/src/amd/addrlib/core/addrcommon.h
+++ b/src/amd/addrlib/core/addrcommon.h
@@ -41,7 +41,7 @@
 // Moved from addrinterface.h so __KERNEL__ is not needed any more
 #if ADDR_LNX_KERNEL_BUILD // || (defined(__GNUC__) && defined(__KERNEL__))
     #include "lnx_common_defs.h" // ported from cmmqs
-#elif !defined(__APPLE__)
+#elif !defined(__APPLE__) || defined(HAVE_TSERVER)
     #include <stdlib.h>
     #include <string.h>
 #endif
-- 
2.30.2