From a2b449a370c062a95b657480afe155f333365684 Mon Sep 17 00:00:00 2001
From: Longlong Yao <Longlong.Yao@amd.com>
Date: Thu, 19 Sep 2024 03:34:33 -0700
Subject: [PATCH] wsl/hsakmt: refine the header guard

Signed-off-by: Longlong Yao <Longlong.Yao@amd.com>
Part-of: <http://10.67.69.192/wsl/libhsakmt/-/merge_requests/26>
---
 inc/pm4_cmds.h               | 4 ++--
 inc/registers.h              | 4 ++--
 inc/thunk_proxy/wddm_types.h | 4 ++--
 inc/wddm/cmd_util.h          | 4 ++--
 inc/wddm/device.h            | 4 ++--
 inc/wddm/gpu_memory.h        | 4 ++--
 inc/wddm/queue.h             | 4 ++--
 inc/wddm/status.h            | 4 ++--
 inc/wddm/thunks.h            | 6 +++---
 inc/wddm/types.h             | 6 +++---
 inc/wddm/va_mgr.h            | 6 +++---
 11 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/inc/pm4_cmds.h b/inc/pm4_cmds.h
index d9e60fc086..44b7fb00aa 100644
--- a/inc/pm4_cmds.h
+++ b/inc/pm4_cmds.h
@@ -1,5 +1,5 @@
-#ifndef _ROCR_PM4_CMDS_H_
-#define _ROCR_PM4_CMDS_H_
+#ifndef _WSL_INC_PM4_CMDS_H_
+#define _WSL_INC_PM4_CMDS_H_
 
 #include <cstdint>
 
diff --git a/inc/registers.h b/inc/registers.h
index 067b808b90..4d430b41e4 100644
--- a/inc/registers.h
+++ b/inc/registers.h
@@ -44,8 +44,8 @@
 // register values in amd_aql_queue.cpp then this file won't be required. For
 // now we are using this file where register details are  spelled out in the
 // structs/unions below.
-#ifndef HSA_RUNTME_CORE_INC_REGISTERS_H_
-#define HSA_RUNTME_CORE_INC_REGISTERS_H_
+#ifndef _WSL_INC_REGISTERS_H_
+#define _WSL_INC_REGISTERS_H_
 
 typedef enum SQ_RSRC_BUF_TYPE {
 SQ_RSRC_BUF                              = 0x00000000,
diff --git a/inc/thunk_proxy/wddm_types.h b/inc/thunk_proxy/wddm_types.h
index f2e60d907d..83422a83d3 100644
--- a/inc/thunk_proxy/wddm_types.h
+++ b/inc/thunk_proxy/wddm_types.h
@@ -40,8 +40,8 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-#ifndef _ROCR_WDDM_TYPES_H_
-#define _ROCR_WDDM_TYPES_H_
+#ifndef _WSL_INC_THUNK_PROXY_WDDM_TYPES_H_
+#define _WSL_INC_THUNK_PROXY_WDDM_TYPES_H_
 
 #include <stdint.h>
 
diff --git a/inc/wddm/cmd_util.h b/inc/wddm/cmd_util.h
index df92e7c233..4f60986925 100644
--- a/inc/wddm/cmd_util.h
+++ b/inc/wddm/cmd_util.h
@@ -1,7 +1,7 @@
 /* Copyright (c) 2023 Advanced Micro Devices, Inc. All rights reserved. */
 
-#ifndef _CMD_UTIL_H_
-#define _CMD_UTIL_H_
+#ifndef _WSL_INC_WDDM_CMD_UTIL_H_
+#define _WSL_INC_WDDM_CMD_UTIL_H_
 
 #include <string.h>
 #include "hsa-runtime/inc/hsa.h"
diff --git a/inc/wddm/device.h b/inc/wddm/device.h
index 1fb78798ad..6136074a14 100644
--- a/inc/wddm/device.h
+++ b/inc/wddm/device.h
@@ -40,8 +40,8 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-#ifndef _ROCR_WDDM_H_
-#define _ROCR_WDDM_H_
+#ifndef _WSL_INC_WDDM_DEVICE_H_
+#define _WSL_INC_WDDM_DEVICE_H_
 
 #include <cassert>
 #include <ntstatus.h>
diff --git a/inc/wddm/gpu_memory.h b/inc/wddm/gpu_memory.h
index adb39f4618..50a7f7d3d8 100644
--- a/inc/wddm/gpu_memory.h
+++ b/inc/wddm/gpu_memory.h
@@ -40,8 +40,8 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-#ifndef _ROCR_GPU_MEMORY_H_
-#define _ROCR_GPU_MEMORY_H_
+#ifndef _WSL_INC_WDDM_GPU_MEMORY_H_
+#define _WSL_INC_WDDM_GPU_MEMORY_H_
 
 #include <cstddef>
 #include <cstdint>
diff --git a/inc/wddm/queue.h b/inc/wddm/queue.h
index 1324aa31a7..7317d87fc8 100644
--- a/inc/wddm/queue.h
+++ b/inc/wddm/queue.h
@@ -39,8 +39,8 @@
 // DEALINGS WITH THE SOFTWARE.
 //
 ////////////////////////////////////////////////////////////////////////////////
-#ifndef _WDDM_QUEUE_H_
-#define _WDDM_QUEUE_H_
+#ifndef _WSL_INC_WDDM_QUEUE_H_
+#define _WSL_INC_WDDM_QUEUE_H_
 
 #include <cinttypes>
 #include <condition_variable>
diff --git a/inc/wddm/status.h b/inc/wddm/status.h
index 96808622ef..a564ff0aac 100644
--- a/inc/wddm/status.h
+++ b/inc/wddm/status.h
@@ -40,8 +40,8 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-#ifndef _ROCR_CORE_INC_WDDM_STATUS_H_
-#define _ROCR_CORE_INC_WDDM_STATUS_H_
+#ifndef _WSL_INC_WDDM_STATUS_H
+#define _WSL_INC_WDDM_STATUS_H
 
 enum class ErrorCode {
   Success,
diff --git a/inc/wddm/thunks.h b/inc/wddm/thunks.h
index 35308d5012..6a573c1a09 100644
--- a/inc/wddm/thunks.h
+++ b/inc/wddm/thunks.h
@@ -40,8 +40,8 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-#ifndef _ROCR_CORE_INC_WDDM_THUNKS_H_
-#define _ROCR_CORE_INC_WDDM_THUNKS_H_
+#ifndef _WSL_INC_WDDM_THUNKS_H
+#define _WSL_INC_WDDM_THUNKS_H
 
 #include "inc/wddm/status.h"
 #include "inc/wddm/types.h"
@@ -229,4 +229,4 @@ inline ErrorCode OpenResourceFromNtHandle(D3DKMT_OPENRESOURCEFROMNTHANDLE *args)
 } // namespace thunk
 } // namespace wsl
 
-#endif // _ROCR_CORE_INC_WDDM_THUNKS_H_
+#endif
diff --git a/inc/wddm/types.h b/inc/wddm/types.h
index 3257902ad6..0bc922b7fd 100644
--- a/inc/wddm/types.h
+++ b/inc/wddm/types.h
@@ -40,8 +40,8 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-#ifndef _ROCR_CORE_INC_WDDM_TYPES_H_
-#define _ROCR_CORE_INC_WDDM_TYPES_H_
+#ifndef _WSL_INC_WDDM_TYPES_H_
+#define _WSL_INC_WDDM_TYPES_H_
 
 #include <cstdint>
 #include <ntstatus.h>
@@ -98,4 +98,4 @@ typedef struct _OBJECT_ATTRIBUTES {
     (p)->SecurityQualityOfService = NULL;               \
     }
 
-#endif // _ROCR_CORE_INC_WDDM_TYPES_H_
+#endif
\ No newline at end of file
diff --git a/inc/wddm/va_mgr.h b/inc/wddm/va_mgr.h
index 439dd55e41..675bfc3e39 100644
--- a/inc/wddm/va_mgr.h
+++ b/inc/wddm/va_mgr.h
@@ -1,5 +1,5 @@
-#ifndef VA_MGR_H_
-#define VA_MGR_H_
+#ifndef _WSL_INC_WDDM_VA_MGR_H_
+#define _WSL_INC_WDDM_VA_MGR_H_
 
 #include <mutex>
 #include <map>
@@ -83,4 +83,4 @@ private:
 
 } // namespace thunk
 } // namespace wsl
-#endif  // VA_MGR_H_
+#endif