From 70cc6cd0201fa67582a8934fe8b12684ba7dd726 Mon Sep 17 00:00:00 2001
From: Michelle McDaniel <adiaaida@gmail.com>
Date: Wed, 21 Sep 2016 10:30:30 -0700
Subject: [PATCH] Fix conflicts between nix and Windows formatting

---
 src/jit/codegeninterface.h | 2 ++
 src/jit/codegenxarch.cpp   | 2 ++
 src/jit/compiler.h         | 5 ++++-
 src/jit/gentree.h          | 2 ++
 src/jit/lsra.cpp           | 2 ++
 5 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/jit/codegeninterface.h b/src/jit/codegeninterface.h
index 1128b6d..b1936ed 100644
--- a/src/jit/codegeninterface.h
+++ b/src/jit/codegeninterface.h
@@ -254,11 +254,13 @@ public:
 private:
     bool m_cgDoubleAlign;
 #else // !DOUBLE_ALIGN
+
 public:
     bool doubleAlignOrFramePointerUsed() const
     {
         return isFramePointerUsed();
     }
+
 #endif // !DOUBLE_ALIGN
 
 #ifdef DEBUG
diff --git a/src/jit/codegenxarch.cpp b/src/jit/codegenxarch.cpp
index 2e764d3..d1b7025 100644
--- a/src/jit/codegenxarch.cpp
+++ b/src/jit/codegenxarch.cpp
@@ -3602,8 +3602,10 @@ void CodeGen::genCodeForInitBlkUnroll(GenTreeBlk* initBlkNode)
         emit->emitIns_AR_R(INS_mov, EA_4BYTE, valReg, dstAddr->gtRegNum, offset);
         offset += 4;
 #else // !_TARGET_X86_
+
         emit->emitIns_AR_R(INS_mov, EA_8BYTE, valReg, dstAddr->gtRegNum, offset);
         offset += 8;
+
 #endif // !_TARGET_X86_
     }
     if ((size & 4) != 0)
diff --git a/src/jit/compiler.h b/src/jit/compiler.h
index 0788303..5b109e9 100644
--- a/src/jit/compiler.h
+++ b/src/jit/compiler.h
@@ -7932,9 +7932,12 @@ public:
         // Such method's compRetNativeType is TYP_STRUCT without a hidden RetBufArg
         return varTypeIsStruct(info.compRetNativeType) && (info.compRetBuffArg == BAD_VAR_NUM);
 #endif // TARGET_XXX
-#else  // not FEATURE_MULTIREG_RET
+
+#else // not FEATURE_MULTIREG_RET
+
         // For this architecture there are no multireg returns
         return false;
+
 #endif // FEATURE_MULTIREG_RET
     }
 
diff --git a/src/jit/gentree.h b/src/jit/gentree.h
index d18b26e..2eb8219 100644
--- a/src/jit/gentree.h
+++ b/src/jit/gentree.h
@@ -430,12 +430,14 @@ struct GenTree
         gtFPlvl = (unsigned char)level;
     }
 #else // FEATURE_STACK_FP_X87
+
     void gtCopyFPlvl(GenTree* other)
     {
     }
     void gtSetFPlvl(unsigned level)
     {
     }
+
 #endif // FEATURE_STACK_FP_X87
 
     //
diff --git a/src/jit/lsra.cpp b/src/jit/lsra.cpp
index b875b17..6f3bfe8 100644
--- a/src/jit/lsra.cpp
+++ b/src/jit/lsra.cpp
@@ -9488,10 +9488,12 @@ void LinearScan::resolveEdge(BasicBlock*      fromBlock,
                     useSwap = true;
                 }
 #else // !_TARGET_XARCH_
+
                 else
                 {
                     tempReg = tempRegInt;
                 }
+
 #endif // !_TARGET_XARCH_
                 if (useSwap || tempReg == REG_NA)
                 {
-- 
2.7.4