HLE: Moved "PARAM" and "RETURN" macros to function_wrappers.h (this is only module where they are needed).

2 files changed, 6 insertions, 5 deletions

diff --git a/src/core/hle/function_wrappers.h b/src/core/hle/function_wrappers.h
index aa5278c8a..0bed78653 100644
--- a/src/core/hle/function_wrappers.h
+++ b/src/core/hle/function_wrappers.h
@@ -10,6 +10,9 @@
 
 namespace HLE {
 
+#define PARAM(n)    Core::g_app_core->GetReg(n)
+#define RETURN(n)   Core::g_app_core->SetReg(0, n)
+
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 // Function wrappers that return type s32
 
@@ -105,4 +108,7 @@ template<void func(const char*)> void Wrap() {
     func(Memory::GetCharPointer(PARAM(0)));
 }
 
+#undef PARAM
+#undef RETURN
+
 } // namespace HLE
diff --git a/src/core/hle/hle.h b/src/core/hle/hle.h
index 0397da5d9..bf4d84575 100644
--- a/src/core/hle/hle.h
+++ b/src/core/hle/hle.h
@@ -9,11 +9,6 @@
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-#define PARAM(n)        Core::g_app_core->GetReg(n)
-#define RETURN(n)       Core::g_app_core->SetReg(0, n)
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
 namespace HLE {
 
 extern bool g_reschedule;   ///< If true, immediately reschedules the CPU to a new thread