From 38062bb90b71bcecb672c100106b9a1e055ed89b Mon Sep 17 00:00:00 2001
From: Jason Orendorff <jorendorff@mozilla.com>
Date: Thu, 6 Jun 2013 22:47:23 -0500
Subject: [PATCH] Bug 879831, part 0 - Add defined(JS_ION) guard to more ion
 headers, to prevent the need for #ifdef JS_ION around #includes in other
 files. r=njn.

---
 js/src/ion/AsmJSModule.h          | 2 +-
 js/src/ion/ExecutionModeInlines.h | 2 +-
 js/src/ion/IonBuilder.h           | 2 +-
 js/src/ion/IonCompartment.h       | 2 +-
 js/src/ion/IonFrameIterator-inl.h | 2 +-
 js/src/ion/IonFrameIterator.h     | 2 +-
 js/src/ion/IonFrames-inl.h        | 2 +-
 js/src/ion/IonFrames.h            | 2 +-
 js/src/ion/IonMacroAssembler.h    | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/js/src/ion/AsmJSModule.h b/js/src/ion/AsmJSModule.h
index 4fa8f07fa4f..e1a930bbb09 100644
--- a/js/src/ion/AsmJSModule.h
+++ b/js/src/ion/AsmJSModule.h
@@ -4,7 +4,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#if !defined(jsion_asmjsmodule_h__)
+#if !defined(jsion_asmjsmodule_h__) && defined(JS_ION)
 #define jsion_asmjsmodule_h__
 
 #include "gc/Marking.h"
diff --git a/js/src/ion/ExecutionModeInlines.h b/js/src/ion/ExecutionModeInlines.h
index be37a412d09..9dbb110b033 100644
--- a/js/src/ion/ExecutionModeInlines.h
+++ b/js/src/ion/ExecutionModeInlines.h
@@ -4,7 +4,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef jsion_compilemode_h__
+#if !defined(jsion_compilemode_h__) && defined(JS_ION)
 #define jsion_compilemode_h__
 
 namespace js {
diff --git a/js/src/ion/IonBuilder.h b/js/src/ion/IonBuilder.h
index b0b7ed2c055..2cfb2877f8e 100644
--- a/js/src/ion/IonBuilder.h
+++ b/js/src/ion/IonBuilder.h
@@ -4,7 +4,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef jsion_bytecode_analyzer_h__
+#if !defined(jsion_bytecode_analyzer_h__) && defined(JS_ION)
 #define jsion_bytecode_analyzer_h__
 
 // This file declares the data structures for building a MIRGraph from a
diff --git a/js/src/ion/IonCompartment.h b/js/src/ion/IonCompartment.h
index cf232b6b096..92658c505b0 100644
--- a/js/src/ion/IonCompartment.h
+++ b/js/src/ion/IonCompartment.h
@@ -4,7 +4,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef jsion_ion_compartment_h__
+#if !defined(jsion_ion_compartment_h__) && defined(JS_ION)
 #define jsion_ion_compartment_h__
 
 #include "IonCode.h"
diff --git a/js/src/ion/IonFrameIterator-inl.h b/js/src/ion/IonFrameIterator-inl.h
index ec0d35a16d1..ac60587643d 100644
--- a/js/src/ion/IonFrameIterator-inl.h
+++ b/js/src/ion/IonFrameIterator-inl.h
@@ -4,7 +4,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef jsion_frame_iterator_inl_h__
+#if !defined(jsion_frame_iterator_inl_h__) && defined(JS_ION)
 #define jsion_frame_iterator_inl_h__
 
 #include "ion/BaselineFrame.h"
diff --git a/js/src/ion/IonFrameIterator.h b/js/src/ion/IonFrameIterator.h
index 7b8bc6af096..ede0184da68 100644
--- a/js/src/ion/IonFrameIterator.h
+++ b/js/src/ion/IonFrameIterator.h
@@ -4,7 +4,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef jsion_frame_iterator_h__
+#if !defined(jsion_frame_iterator_h__) && defined(JS_ION)
 #define jsion_frame_iterator_h__
 
 #include "jstypes.h"
diff --git a/js/src/ion/IonFrames-inl.h b/js/src/ion/IonFrames-inl.h
index 7baa1d536ed..34e05d5c511 100644
--- a/js/src/ion/IonFrames-inl.h
+++ b/js/src/ion/IonFrames-inl.h
@@ -4,7 +4,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef jsion_frames_inl_h__
+#if !defined(jsion_frames_inl_h__) && defined(JS_ION)
 #define jsion_frames_inl_h__
 
 #include "ion/IonFrames.h"
diff --git a/js/src/ion/IonFrames.h b/js/src/ion/IonFrames.h
index 912d4481e46..8bc66296791 100644
--- a/js/src/ion/IonFrames.h
+++ b/js/src/ion/IonFrames.h
@@ -4,7 +4,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef jsion_frames_h__
+#if !defined(jsion_frames_h__) && defined(JS_ION)
 #define jsion_frames_h__
 
 #include "mozilla/DebugOnly.h"
diff --git a/js/src/ion/IonMacroAssembler.h b/js/src/ion/IonMacroAssembler.h
index 7990f9e671c..5947740ee58 100644
--- a/js/src/ion/IonMacroAssembler.h
+++ b/js/src/ion/IonMacroAssembler.h
@@ -4,7 +4,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef jsion_macro_assembler_h__
+#if !defined(jsion_macro_assembler_h__) && defined(JS_ION)
 #define jsion_macro_assembler_h__
 
 #if defined(JS_CPU_X86)