From 864e257474458815e9324e772dbb651cb2603b65 Mon Sep 17 00:00:00 2001
From: "Dr. Chat" <arkolbed@gmail.com>
Date: Fri, 12 Jun 2015 18:59:08 -0500
Subject: [PATCH] DISPATCH_HEADER -> X_DISPATCH_HEADER

---
 src/xenia/kernel/objects/xevent.cc     | 2 +-
 src/xenia/kernel/objects/xevent.h      | 2 +-
 src/xenia/kernel/objects/xmutant.cc    | 2 +-
 src/xenia/kernel/objects/xmutant.h     | 2 +-
 src/xenia/kernel/objects/xsemaphore.cc | 2 +-
 src/xenia/kernel/objects/xsemaphore.h  | 2 +-
 src/xenia/kernel/xobject.cc            | 4 ++--
 src/xenia/kernel/xobject.h             | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/xenia/kernel/objects/xevent.cc b/src/xenia/kernel/objects/xevent.cc
index f1e7a39d5..3a6fd9a9c 100644
--- a/src/xenia/kernel/objects/xevent.cc
+++ b/src/xenia/kernel/objects/xevent.cc
@@ -28,7 +28,7 @@ void XEvent::Initialize(bool manual_reset, bool initial_state) {
   native_handle_ = CreateEvent(NULL, manual_reset, initial_state, NULL);
 }
 
-void XEvent::InitializeNative(void* native_ptr, DISPATCH_HEADER& header) {
+void XEvent::InitializeNative(void* native_ptr, X_DISPATCH_HEADER& header) {
   assert_null(native_handle_);
 
   bool manual_reset;
diff --git a/src/xenia/kernel/objects/xevent.h b/src/xenia/kernel/objects/xevent.h
index 68c06044f..9def93869 100644
--- a/src/xenia/kernel/objects/xevent.h
+++ b/src/xenia/kernel/objects/xevent.h
@@ -22,7 +22,7 @@ class XEvent : public XObject {
   virtual ~XEvent();
 
   void Initialize(bool manual_reset, bool initial_state);
-  void InitializeNative(void* native_ptr, DISPATCH_HEADER& header);
+  void InitializeNative(void* native_ptr, X_DISPATCH_HEADER& header);
 
   int32_t Set(uint32_t priority_increment, bool wait);
   int32_t Pulse(uint32_t priority_increment, bool wait);
diff --git a/src/xenia/kernel/objects/xmutant.cc b/src/xenia/kernel/objects/xmutant.cc
index 006697def..a26e8c79f 100644
--- a/src/xenia/kernel/objects/xmutant.cc
+++ b/src/xenia/kernel/objects/xmutant.cc
@@ -27,7 +27,7 @@ void XMutant::Initialize(bool initial_owner) {
   native_handle_ = CreateMutex(NULL, initial_owner ? TRUE : FALSE, NULL);
 }
 
-void XMutant::InitializeNative(void* native_ptr, DISPATCH_HEADER& header) {
+void XMutant::InitializeNative(void* native_ptr, X_DISPATCH_HEADER& header) {
   assert_null(native_handle_);
 
   // Haven't seen this yet, but it's possible.
diff --git a/src/xenia/kernel/objects/xmutant.h b/src/xenia/kernel/objects/xmutant.h
index bc62a1b53..359970209 100644
--- a/src/xenia/kernel/objects/xmutant.h
+++ b/src/xenia/kernel/objects/xmutant.h
@@ -22,7 +22,7 @@ class XMutant : public XObject {
   virtual ~XMutant();
 
   void Initialize(bool initial_owner);
-  void InitializeNative(void* native_ptr, DISPATCH_HEADER& header);
+  void InitializeNative(void* native_ptr, X_DISPATCH_HEADER& header);
 
   X_STATUS ReleaseMutant(uint32_t priority_increment, bool abandon, bool wait);
 
diff --git a/src/xenia/kernel/objects/xsemaphore.cc b/src/xenia/kernel/objects/xsemaphore.cc
index 72d473d96..a1b81f33f 100644
--- a/src/xenia/kernel/objects/xsemaphore.cc
+++ b/src/xenia/kernel/objects/xsemaphore.cc
@@ -27,7 +27,7 @@ void XSemaphore::Initialize(int32_t initial_count, int32_t maximum_count) {
   native_handle_ = CreateSemaphore(NULL, initial_count, maximum_count, NULL);
 }
 
-void XSemaphore::InitializeNative(void* native_ptr, DISPATCH_HEADER& header) {
+void XSemaphore::InitializeNative(void* native_ptr, X_DISPATCH_HEADER& header) {
   assert_null(native_handle_);
 
   // NOT IMPLEMENTED
diff --git a/src/xenia/kernel/objects/xsemaphore.h b/src/xenia/kernel/objects/xsemaphore.h
index fd693d72a..856d4227d 100644
--- a/src/xenia/kernel/objects/xsemaphore.h
+++ b/src/xenia/kernel/objects/xsemaphore.h
@@ -22,7 +22,7 @@ class XSemaphore : public XObject {
   virtual ~XSemaphore();
 
   void Initialize(int32_t initial_count, int32_t maximum_count);
-  void InitializeNative(void* native_ptr, DISPATCH_HEADER& header);
+  void InitializeNative(void* native_ptr, X_DISPATCH_HEADER& header);
 
   int32_t ReleaseSemaphore(int32_t release_count);
 
diff --git a/src/xenia/kernel/xobject.cc b/src/xenia/kernel/xobject.cc
index 850bb8c0c..eb9c64e7d 100644
--- a/src/xenia/kernel/xobject.cc
+++ b/src/xenia/kernel/xobject.cc
@@ -165,7 +165,7 @@ void XObject::SetNativePointer(uint32_t native_ptr, bool uninitialized) {
   std::lock_guard<xe::recursive_mutex> lock(kernel_state_->object_mutex());
 
   auto header =
-      kernel_state_->memory()->TranslateVirtual<DISPATCH_HEADER*>(native_ptr);
+      kernel_state_->memory()->TranslateVirtual<X_DISPATCH_HEADER*>(native_ptr);
 
   // Memory uninitialized, so don't bother with the check.
   if (!uninitialized) {
@@ -195,7 +195,7 @@ object_ref<XObject> XObject::GetNativeObject(KernelState* kernel_state,
 
   std::lock_guard<xe::recursive_mutex> lock(kernel_state->object_mutex());
 
-  auto header = reinterpret_cast<DISPATCH_HEADER*>(native_ptr);
+  auto header = reinterpret_cast<X_DISPATCH_HEADER*>(native_ptr);
 
   if (as_type == -1) {
     as_type = (header->type_flags >> 24) & 0xFF;
diff --git a/src/xenia/kernel/xobject.h b/src/xenia/kernel/xobject.h
index 751eff15c..cebd70c68 100644
--- a/src/xenia/kernel/xobject.h
+++ b/src/xenia/kernel/xobject.h
@@ -33,7 +33,7 @@ typedef struct {
   xe::be<uint32_t> signal_state;
   xe::be<uint32_t> wait_list_flink;
   xe::be<uint32_t> wait_list_blink;
-} DISPATCH_HEADER;
+} X_DISPATCH_HEADER;
 
 class XObject {
  public: