From e5387eaacabbb673c0329525ffea2f5d8a33a8b5 Mon Sep 17 00:00:00 2001
From: kobalicek <kobalicek.petr@gmail.com>
Date: Fri, 6 Jun 2014 10:41:43 +0200
Subject: [PATCH] Fixed #35 (namespace x86x64 in x86regs.h not included).

---
 src/asmjit/x86/x86assembler.cpp | 2 +-
 src/asmjit/x86/x86operand.h     | 6 ------
 src/asmjit/x86/x86regs.h        | 3 +++
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/asmjit/x86/x86assembler.cpp b/src/asmjit/x86/x86assembler.cpp
index 9ccc008..360e1ad 100644
--- a/src/asmjit/x86/x86assembler.cpp
+++ b/src/asmjit/x86/x86assembler.cpp
@@ -1512,7 +1512,7 @@ _Prepare:
         ASMJIT_ASSERT(static_cast<const X86Reg*>(o0)->getRegIndex() == kRegIndexCx);
 
         if ((Arch == kArchX86 && o0->getSize() == 2) ||
-             Arch == kArchX64 && o0->getSize() == 4) {
+            (Arch == kArchX64 && o0->getSize() == 4)) {
           EMIT_BYTE(0x67);
         }
 
diff --git a/src/asmjit/x86/x86operand.h b/src/asmjit/x86/x86operand.h
index 46765d4..7d61907 100644
--- a/src/asmjit/x86/x86operand.h
+++ b/src/asmjit/x86/x86operand.h
@@ -1490,9 +1490,6 @@ static ASMJIT_INLINE uint32_t x86VarTypeToClass(uint32_t vType) {
 namespace asmjit {
 namespace x86 {
 
-// This is the only place where the x86x64 namespace is included into x86.
-using namespace ::asmjit::x86x64;
-
 //! \addtogroup asmjit_x86x64_general
 //! \{
 
@@ -1577,9 +1574,6 @@ static ASMJIT_INLINE Mem intptr_ptr_abs(Ptr pAbs, const GpVar& index, uint32_t s
 namespace asmjit {
 namespace x64 {
 
-// This is the only place where the x86x64 namespace is included into x64.
-using namespace ::asmjit::x86x64;
-
 //! \addtogroup asmjit_x86x64_general
 //! \{
 
diff --git a/src/asmjit/x86/x86regs.h b/src/asmjit/x86/x86regs.h
index 98e72a1..b38217c 100644
--- a/src/asmjit/x86/x86regs.h
+++ b/src/asmjit/x86/x86regs.h
@@ -328,6 +328,9 @@ ASMJIT_VAR const SegReg gs;    //!< Gs segment register.
 namespace asmjit {
 namespace x86 {
 
+// This is the only place where the x86x64 namespace is included into x86.
+using namespace ::asmjit::x86x64;
+
 //! \addtogroup asmjit_x86x64_general
 //! \{