Bug 883697 (part 3) - Make include guards consistent in some more of js/src/. r=njn.

--HG--
extra : rebase_source : 7103c57165f3ed54d94b4c05837281a35224f706

js/src/assembler/assembler/ARMAssembler.h

@@ -28,8 +28,8 @@
  * 
  * ***** END LICENSE BLOCK ***** */
 
-#ifndef ARMAssembler_h
-#define ARMAssembler_h
+#ifndef assembler_assembler_ARMAssembler_h
+#define assembler_assembler_ARMAssembler_h
 
 #include "assembler/wtf/Platform.h"
 
@@ -1705,4 +1705,4 @@ namespace JSC {
 
 #endif // ENABLE(ASSEMBLER) && CPU(ARM_TRADITIONAL)
 
-#endif // ARMAssembler_h
+#endif /* assembler_assembler_ARMAssembler_h */

js/src/assembler/assembler/ARMv7Assembler.h

@@ -28,8 +28,8 @@
  * 
  * ***** END LICENSE BLOCK ***** */
 
-#ifndef ARMAssembler_h
-#define ARMAssembler_h
+#ifndef assembler_assembler_ARMv7Assembler_h
+#define assembler_assembler_ARMv7Assembler_h
 
 #include "assembler/wtf/Platform.h"
 
@@ -1929,4 +1929,4 @@ private:
 
 #endif // ENABLE(ASSEMBLER) && CPU(ARM_THUMB2)
 
-#endif // ARMAssembler_h
+#endif /* assembler_assembler_ARMv7Assembler_h */

js/src/assembler/assembler/AbstractMacroAssembler.h

@@ -27,8 +27,8 @@
  * 
  * ***** END LICENSE BLOCK ***** */
 
-#ifndef AbstractMacroAssembler_h
-#define AbstractMacroAssembler_h
+#ifndef assembler_assembler_AbstractMacroAssembler_h
+#define assembler_assembler_AbstractMacroAssembler_h
 
 #include "assembler/wtf/Platform.h"
 #include "assembler/assembler/MacroAssemblerCodeRef.h"
@@ -656,4 +656,4 @@ protected:
 
 #endif // ENABLE(ASSEMBLER)
 
-#endif // AbstractMacroAssembler_h
+#endif /* assembler_assembler_AbstractMacroAssembler_h */

js/src/assembler/assembler/AssemblerBuffer.h

@@ -27,8 +27,8 @@
  * 
  * ***** END LICENSE BLOCK ***** */
 
-#ifndef AssemblerBuffer_h
-#define AssemblerBuffer_h
+#ifndef assembler_assembler_AssemblerBuffer_h
+#define assembler_assembler_AssemblerBuffer_h
 
 #include "assembler/wtf/Platform.h"
 
@@ -336,4 +336,4 @@ namespace JSC {
 
 #endif // ENABLE(ASSEMBLER)
 
-#endif // AssemblerBuffer_h
+#endif /* assembler_assembler_AssemblerBuffer_h */

js/src/assembler/assembler/AssemblerBufferWithConstantPool.h

@@ -28,8 +28,8 @@
  * 
  * ***** END LICENSE BLOCK ***** */
 
-#ifndef AssemblerBufferWithConstantPool_h
-#define AssemblerBufferWithConstantPool_h
+#ifndef assembler_assembler_AssemblerBufferWithConstantPool_h
+#define assembler_assembler_AssemblerBufferWithConstantPool_h
 
 #include "assembler/wtf/Platform.h"
 
@@ -383,4 +383,4 @@ private:
 
 #endif // ENABLE(ASSEMBLER)
 
-#endif // AssemblerBufferWithConstantPool_h
+#endif /* assembler_assembler_AssemblerBufferWithConstantPool_h */

js/src/assembler/assembler/CodeLocation.h

@@ -27,8 +27,8 @@
  * 
  * ***** END LICENSE BLOCK ***** */
 
-#ifndef CodeLocation_h
-#define CodeLocation_h
+#ifndef assembler_assembler_CodeLocation_h
+#define assembler_assembler_CodeLocation_h
 
 #include "assembler/wtf/Platform.h"
 #include "assembler/assembler/MacroAssemblerCodeRef.h"
@@ -186,4 +186,4 @@ inline CodeLocationDataLabel32 CodeLocationCommon::dataLabel32AtOffset(int offse
 
 #endif // ENABLE(ASSEMBLER)
 
-#endif // CodeLocation_h
+#endif /* assembler_assembler_CodeLocation_h */

js/src/assembler/assembler/LinkBuffer.h

@@ -27,8 +27,8 @@
  * 
  * ***** END LICENSE BLOCK ***** */
 
-#ifndef LinkBuffer_h
-#define LinkBuffer_h
+#ifndef assembler_assembler_LinkBuffer_h
+#define assembler_assembler_LinkBuffer_h
 
 #include "assembler/wtf/Platform.h"
 
@@ -230,4 +230,4 @@ protected:
 
 #endif // ENABLE(ASSEMBLER)
 
-#endif // LinkBuffer_h
+#endif /* assembler_assembler_LinkBuffer_h */

js/src/assembler/assembler/MIPSAssembler.h

@@ -26,8 +26,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef MIPSAssembler_h
-#define MIPSAssembler_h
+#ifndef assembler_assembler_MIPSAssembler_h
+#define assembler_assembler_MIPSAssembler_h
 
 #if ENABLE(ASSEMBLER) && CPU(MIPS)
 
@@ -1070,4 +1070,4 @@ private:
 
 #endif // ENABLE(ASSEMBLER) && CPU(MIPS)
 
-#endif // MIPSAssembler_h
+#endif /* assembler_assembler_MIPSAssembler_h */

js/src/assembler/assembler/MacroAssembler.h

@@ -27,8 +27,8 @@
  * 
  * ***** END LICENSE BLOCK ***** */
 
-#ifndef MacroAssembler_h
-#define MacroAssembler_h
+#ifndef assembler_assembler_MacroAssembler_h
+#define assembler_assembler_MacroAssembler_h
 
 #include "assembler/wtf/Platform.h"
 
@@ -393,4 +393,4 @@ public:
 
 #endif // ENABLE(ASSEMBLER)
 
-#endif // MacroAssembler_h
+#endif /* assembler_assembler_MacroAssembler_h */

js/src/assembler/assembler/MacroAssemblerARM.h

@@ -29,8 +29,8 @@
  * 
  * ***** END LICENSE BLOCK ***** */
 
-#ifndef MacroAssemblerARM_h
-#define MacroAssemblerARM_h
+#ifndef assembler_assembler_MacroAssemblerARM_h
+#define assembler_assembler_MacroAssemblerARM_h
 
 #include "assembler/wtf/Platform.h"
 
@@ -1542,4 +1542,4 @@ private:
 
 #endif // ENABLE(ASSEMBLER) && CPU(ARM_TRADITIONAL)
 
-#endif // MacroAssemblerARM_h
+#endif /* assembler_assembler_MacroAssemblerARM_h */

js/src/assembler/assembler/MacroAssemblerARMv7.h

@@ -28,8 +28,8 @@
  * 
  * ***** END LICENSE BLOCK ***** */
 
-#ifndef MacroAssemblerARMv7_h
-#define MacroAssemblerARMv7_h
+#ifndef assembler_assembler_MacroAssemblerARMv7_h
+#define assembler_assembler_MacroAssemblerARMv7_h
 
 #include "assembler/wtf/Platform.h"
 
@@ -1220,4 +1220,4 @@ private:
 
 #endif // ENABLE(ASSEMBLER)
 
-#endif // MacroAssemblerARMv7_h
+#endif /* assembler_assembler_MacroAssemblerARMv7_h */

js/src/assembler/assembler/MacroAssemblerCodeRef.h

@@ -27,8 +27,8 @@
  * 
  * ***** END LICENSE BLOCK ***** */
 
-#ifndef MacroAssemblerCodeRef_h
-#define MacroAssemblerCodeRef_h
+#ifndef assembler_assembler_MacroAssemblerCodeRef_h
+#define assembler_assembler_MacroAssemblerCodeRef_h
 
 #include "assembler/wtf/Platform.h"
 #include "assembler/jit/ExecutableAllocator.h"
@@ -222,4 +222,4 @@ public:
 
 #endif // ENABLE(ASSEMBLER)
 
-#endif // MacroAssemblerCodeRef_h
+#endif /* assembler_assembler_MacroAssemblerCodeRef_h */

js/src/assembler/assembler/MacroAssemblerMIPS.h

@@ -24,8 +24,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef MacroAssemblerMIPS_h
-#define MacroAssemblerMIPS_h
+#ifndef assembler_assembler_MacroAssemblerMIPS_h
+#define assembler_assembler_MacroAssemblerMIPS_h
 
 #if ENABLE(ASSEMBLER) && CPU(MIPS)
 
@@ -2787,4 +2787,4 @@ private:
 
 #endif // ENABLE(ASSEMBLER) && CPU(MIPS)
 
-#endif // MacroAssemblerMIPS_h
+#endif /* assembler_assembler_MacroAssemblerMIPS_h */

js/src/assembler/assembler/MacroAssemblerSparc.h

@@ -4,8 +4,8 @@
  * 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 MacroAssemblerSparc_h
-#define MacroAssemblerSparc_h
+#ifndef assembler_assembler_MacroAssemblerSparc_h
+#define assembler_assembler_MacroAssemblerSparc_h
 
 #include <assembler/wtf/Platform.h>
 
@@ -1458,4 +1458,4 @@ namespace JSC {
 
 #endif // ENABLE(ASSEMBLER) && CPU(SPARC)
 
-#endif // MacroAssemblerSparc_h
+#endif /* assembler_assembler_MacroAssemblerSparc_h */

js/src/assembler/assembler/MacroAssemblerX86.h

@@ -27,8 +27,8 @@
  * 
  * ***** END LICENSE BLOCK ***** */
 
-#ifndef MacroAssemblerX86_h
-#define MacroAssemblerX86_h
+#ifndef assembler_assembler_MacroAssemblerX86_h
+#define assembler_assembler_MacroAssemblerX86_h
 
 #include "assembler/wtf/Platform.h"
 
@@ -260,4 +260,4 @@ private:
 
 #endif // ENABLE(ASSEMBLER)
 
-#endif // MacroAssemblerX86_h
+#endif /* assembler_assembler_MacroAssemblerX86_h */

js/src/assembler/assembler/MacroAssemblerX86Common.h

@@ -27,8 +27,8 @@
  * 
  * ***** END LICENSE BLOCK ***** */
 
-#ifndef MacroAssemblerX86Common_h
-#define MacroAssemblerX86Common_h
+#ifndef assembler_assembler_MacroAssemblerX86Common_h
+#define assembler_assembler_MacroAssemblerX86Common_h
 
 #include "assembler/wtf/Platform.h"
 
@@ -1517,4 +1517,4 @@ private:
 
 #endif // ENABLE(ASSEMBLER)
 
-#endif // MacroAssemblerX86Common_h
+#endif /* assembler_assembler_MacroAssemblerX86Common_h */

js/src/assembler/assembler/MacroAssemblerX86_64.h

@@ -27,8 +27,8 @@
  * 
  * ***** END LICENSE BLOCK ***** */
 
-#ifndef MacroAssemblerX86_64_h
-#define MacroAssemblerX86_64_h
+#ifndef assembler_assembler_MacroAssemblerX86_64_h
+#define assembler_assembler_MacroAssemblerX86_64_h
 
 #include "mozilla/DebugOnly.h"
 
@@ -601,4 +601,4 @@ private:
 
 #endif // ENABLE(ASSEMBLER)
 
-#endif // MacroAssemblerX86_64_h
+#endif /* assembler_assembler_MacroAssemblerX86_64_h */

js/src/assembler/assembler/RepatchBuffer.h

@@ -27,8 +27,8 @@
  * 
  * ***** END LICENSE BLOCK ***** */
 
-#ifndef RepatchBuffer_h
-#define RepatchBuffer_h
+#ifndef assembler_assembler_RepatchBuffer_h
+#define assembler_assembler_RepatchBuffer_h
 
 #include "assembler/wtf/Platform.h"
 
@@ -160,4 +160,4 @@ protected:
 
 #endif // ENABLE(ASSEMBLER)
 
-#endif // RepatchBuffer_h
+#endif /* assembler_assembler_RepatchBuffer_h */

js/src/assembler/assembler/SparcAssembler.h

@@ -4,8 +4,8 @@
  * 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 SparcAssembler_h
-#define SparcAssembler_h
+#ifndef assembler_assembler_SparcAssembler_h
+#define assembler_assembler_SparcAssembler_h
 
 #include <assembler/wtf/Platform.h>
 
@@ -1215,4 +1215,4 @@ namespace JSC {
 
 #endif // ENABLE(ASSEMBLER) && CPU(SPARC)
 
-#endif // SparcAssembler_h
+#endif /* assembler_assembler_SparcAssembler_h */

js/src/assembler/assembler/X86Assembler.h

@@ -27,8 +27,8 @@
  * 
  * ***** END LICENSE BLOCK ***** */
 
-#ifndef X86Assembler_h
-#define X86Assembler_h
+#ifndef assembler_assembler_X86Assembler_h
+#define assembler_assembler_X86Assembler_h
 
 #include <stdarg.h>
 
@@ -3501,4 +3501,4 @@ private:
 
 #endif // ENABLE(ASSEMBLER) && CPU(X86)
 
-#endif // X86Assembler_h
+#endif /* assembler_assembler_X86Assembler_h */

js/src/assembler/jit/ExecutableAllocator.h

@@ -23,8 +23,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#ifndef ExecutableAllocator_h
-#define ExecutableAllocator_h
+#ifndef assembler_jit_ExecutableAllocator_h
+#define assembler_jit_ExecutableAllocator_h
 
 #include <stddef.h> // for ptrdiff_t
 #include <limits>
@@ -505,5 +505,4 @@ private:
 
 #endif // ENABLE(ASSEMBLER)
 
-#endif // !defined(ExecutableAllocator)
-
+#endif /* assembler_jit_ExecutableAllocator_h */

js/src/assembler/moco/MocoStubs.h

@@ -4,8 +4,8 @@
  * 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 _include_assembler_moco_stubs_h_
-#define _include_assembler_moco_stubs_h_
+#ifndef assembler_moco_MocoStubs_h
+#define assembler_moco_MocoStubs_h
 
 namespace JSC {
 
@@ -35,5 +35,4 @@ private:
 
 } // namespace JSC
 
-#endif /* _include_assembler_moco_stubs_h_ */
-
+#endif /* assembler_moco_MocoStubs_h */

js/src/assembler/wtf/Assertions.h

@@ -23,8 +23,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#ifndef WTF_Assertions_h
-#define WTF_Assertions_h
+#ifndef assembler_wtf_Assertions_h
+#define assembler_wtf_Assertions_h
 
 #include "Platform.h"
 #include "mozilla/Assertions.h"
@@ -46,5 +46,4 @@
 #define CRASH() MOZ_CRASH()
 #define COMPILE_ASSERT(exp, name) MOZ_STATIC_ASSERT(exp, #name)
 
-#endif  // WTF_Assertions_h
-
+#endif /* assembler_wtf_Assertions_h */

js/src/assembler/wtf/Platform.h

@@ -25,8 +25,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef WTF_Platform_h
-#define WTF_Platform_h
+#ifndef assembler_wtf_Platform_h
+#define assembler_wtf_Platform_h
 
 /* ==== PLATFORM handles OS, operating environment, graphics API, and
    CPU. This macro will be phased out in favor of platform adaptation
@@ -1233,4 +1233,4 @@
 #define WTF_USE_UNIX_DOMAIN_SOCKETS 1
 #endif
 
-#endif /* WTF_Platform_h */
+#endif /* assembler_wtf_Platform_h */

js/src/assembler/wtf/SegmentedVector.h

@@ -26,8 +26,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef SegmentedVector_h
-#define SegmentedVector_h
+#ifndef assembler_wtf_SegmentedVector_h
+#define assembler_wtf_SegmentedVector_h
 
 #include "jsprvtd.h"
 #include "js/Vector.h"
@@ -261,4 +261,4 @@ namespace WTF {
 
 using WTF::SegmentedVector;
 
-#endif // SegmentedVector_h
+#endif /* assembler_wtf_SegmentedVector_h */

js/src/assembler/wtf/VMTags.h

@@ -23,8 +23,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#ifndef VMTags_h
-#define VMTags_h
+#ifndef assembler_wtf_VMTags_h
+#define assembler_wtf_VMTags_h
 
 // On Mac OS X, the VM subsystem allows tagging memory requested from mmap and vm_map
 // in order to aid tools that inspect system memory use. 
@@ -87,4 +87,4 @@
 
 #endif // OS(DARWIN)
 
-#endif // VMTags_h
+#endif /* assembler_wtf_VMTags_h */

js/src/builtin/Eval.h

@@ -4,10 +4,10 @@
  * 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/. */
 
-#include "vm/Stack.h"
+#ifndef builtin_Eval_h
+#define builtin_Eval_h
 
-#ifndef Eval_h__
-#define Eval_h__
+#include "vm/Stack.h"
 
 namespace js {
 
@@ -47,4 +47,4 @@ extern JSPrincipals *
 PrincipalsForCompiledCode(const CallReceiver &call, JSContext *cx);
 
 }  // namespace js
-#endif  // Eval_h__
+#endif /* builtin_Eval_h */

js/src/builtin/Intl.h

@@ -4,8 +4,8 @@
  * 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 Intl_h___
-#define Intl_h___
+#ifndef builtin_Intl_h
+#define builtin_Intl_h
 
 #include "jsapi.h"
 
@@ -186,4 +186,4 @@ intl_FormatDateTime(JSContext *cx, unsigned argc, Value *vp);
 
 } // namespace js
 
-#endif /* Intl_h___ */
+#endif /* builtin_Intl_h */

js/src/builtin/Iterator-inl.h

@@ -4,8 +4,8 @@
  * 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 Iterator_inl_h_
-#define Iterator_inl_h_
+#ifndef builtin_Iterator_inl_h
+#define builtin_Iterator_inl_h
 
 #include "jsiter.h"
 #include "vm/ObjectImpl-inl.h"
@@ -23,4 +23,4 @@ js::PropertyIteratorObject::setNativeIterator(js::NativeIterator *ni)
     setPrivate(ni);
 }
 
-#endif  // Iterator_inl_h_
+#endif /* builtin_Iterator_inl_h */

js/src/builtin/MapObject.h

@@ -4,8 +4,8 @@
  * 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 MapObject_h__
-#define MapObject_h__
+#ifndef builtin_MapObject_h
+#define builtin_MapObject_h
 
 #include "jsapi.h"
 #include "jscntxt.h"
@@ -164,4 +164,4 @@ js_InitMapClass(JSContext *cx, js::HandleObject obj);
 extern JSObject *
 js_InitSetClass(JSContext *cx, js::HandleObject obj);
 
-#endif  /* MapObject_h__ */
+#endif /* builtin_MapObject_h */

js/src/builtin/Module.h

@@ -4,8 +4,8 @@
  * 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 Module_h___
-#define Module_h___
+#ifndef builtin_Module_h
+#define builtin_Module_h
 
 #include "jsobj.h"
 
@@ -35,4 +35,4 @@ class Module : public JSObject {
 
 } // namespace js
 
-#endif // Module_h___
+#endif /* builtin_Module_h */

js/src/builtin/Object.h

@@ -4,8 +4,8 @@
  * 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 Object_h___
-#define Object_h___
+#ifndef builtin_Object_h
+#define builtin_Object_h
 
 #include "jsobj.h"
 
@@ -20,4 +20,4 @@ obj_construct(JSContext *cx, unsigned argc, js::Value *vp);
 
 } /* namespace js */
 
-#endif
+#endif /* builtin_Object_h */

js/src/builtin/ParallelArray.h

@@ -4,8 +4,8 @@
  * 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 ParallelArray_h__
-#define ParallelArray_h__
+#ifndef builtin_ParallelArray_h
+#define builtin_ParallelArray_h
 
 #include "jsapi.h"
 #include "jscntxt.h"
@@ -57,4 +57,4 @@ class ParallelArrayObject : public JSObject
 extern JSObject *
 js_InitParallelArrayClass(JSContext *cx, js::HandleObject obj);
 
-#endif // ParallelArray_h__
+#endif /* builtin_ParallelArray_h */

js/src/builtin/Profilers.h

@@ -8,8 +8,8 @@
  * Functions for controlling profilers from within JS: Valgrind, Perf,
  * Shark, etc.
  */
-#ifndef Profilers_h___
-#define Profilers_h___
+#ifndef builtin_Profilers_h
+#define builtin_Profilers_h
 
 #include "jstypes.h"
 
@@ -86,4 +86,4 @@ js_StopPerf();
 
 #endif /* __linux__ */
 
-#endif /* Profilers_h___ */
+#endif /* builtin_Profilers_h */

js/src/builtin/RegExp.h

@@ -4,8 +4,8 @@
  * 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 RegExp_h___
-#define RegExp_h___
+#ifndef builtin_RegExp_h
+#define builtin_RegExp_h
 
 #include "jsprvtd.h"
 
@@ -58,4 +58,4 @@ regexp_test(JSContext *cx, unsigned argc, Value *vp);
 
 } /* namespace js */
 
-#endif /* RegExp_h__ */
+#endif /* builtin_RegExp_h */

js/src/builtin/TestingFunctions.h

@@ -4,8 +4,8 @@
  * 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 TestingFunctions_h__
-#define TestingFunctions_h__
+#ifndef builtin_TestingFunctions_h
+#define builtin_TestingFunctions_h
 
 #include "jsapi.h"
 
@@ -19,4 +19,4 @@ testingFunc_inParallelSection(JSContext *cx, unsigned argc, jsval *vp);
 
 } /* namespace js */
 
-#endif /* TestingFunctions_h__ */
+#endif /* builtin_TestingFunctions_h */

js/src/ctypes/CTypes.h

@@ -3,8 +3,8 @@
  * 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 CTYPES_H
-#define CTYPES_H
+#ifndef ctypes_CTypes_h
+#define ctypes_CTypes_h
 
 #include "jscntxt.h"
 #include "jsapi.h"
@@ -509,4 +509,4 @@ namespace UInt64 {
 }
 }
 
-#endif
+#endif /* ctypes_CTypes_h */

js/src/ctypes/Library.h

@@ -3,8 +3,8 @@
  * 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 LIBRARY_H
-#define LIBRARY_H
+#ifndef ctypes_Library_h
+#define ctypes_Library_h
 
 #include "jsapi.h"
 
@@ -33,4 +33,4 @@ namespace Library
 }
 }
 
-#endif
+#endif /* ctypes_Library_h */

js/src/ctypes/typedefs.h

@@ -15,6 +15,9 @@
  * which sizeof(ctype) and templated type conversions will be derived), and
  * 'ffitype' is the ffi_type to use. (Special types, such as 'void' and the
  * pointer, array, and struct types are handled separately.)
+ *
+ * This header lacks a #ifndef wrapper because it is deliberately #included
+ * multiple times in ctypes/CTypes.h.
  */
 
 // If we're not breaking the types out, combine them together under one

js/src/frontend/BytecodeCompiler.h

@@ -4,8 +4,8 @@
  * 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 BytecodeCompiler_h__
-#define BytecodeCompiler_h__
+#ifndef frontend_BytecodeCompiler_h
+#define frontend_BytecodeCompiler_h
 
 #include "jsapi.h"
 
@@ -57,4 +57,4 @@ MarkParser(JSTracer *trc, AutoGCRooter *parser);
 } /* namespace frontend */
 } /* namespace js */
 
-#endif /* BytecodeCompiler_h__ */
+#endif /* frontend_BytecodeCompiler_h */

js/src/frontend/BytecodeEmitter-inl.h

@@ -4,8 +4,8 @@
  * 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 BytecodeEmitter_inl_h__
-#define BytecodeEmitter_inl_h__
+#ifndef frontend_BytecodeEmitter_inl_h
+#define frontend_BytecodeEmitter_inl_h
 
 #include "frontend/BytecodeEmitter.h"
 #include "frontend/Parser.h"
@@ -22,4 +22,4 @@ BytecodeEmitter::tokenStream()
 } // namespace frontend
 } // namespace js
 
-#endif // BytecodeEmitter_inl_h__
+#endif /* frontend_BytecodeEmitter_inl_h */

js/src/frontend/BytecodeEmitter.h

@@ -4,8 +4,8 @@
  * 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 BytecodeEmitter_h__
-#define BytecodeEmitter_h__
+#ifndef frontend_BytecodeEmitter_h
+#define frontend_BytecodeEmitter_h
 
 /*
  * JS bytecode generation.
@@ -297,4 +297,4 @@ BytecodeEmitter::countFinalSourceNotes()
 } /* namespace frontend */
 } /* namespace js */
 
-#endif /* BytecodeEmitter_h__ */
+#endif /* frontend_BytecodeEmitter_h */

js/src/frontend/FoldConstants.h

@@ -4,8 +4,8 @@
  * 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 FoldConstants_h__
-#define FoldConstants_h__
+#ifndef frontend_FoldConstants_h
+#define frontend_FoldConstants_h
 
 #include "jsprvtd.h"
 
@@ -34,4 +34,4 @@ FoldConstants(JSContext *cx, typename ParseHandler::Node *pnp,
 } /* namespace frontend */
 } /* namespace js */
 
-#endif /* FoldConstants_h__ */
+#endif /* frontend_FoldConstants_h */

js/src/frontend/FullParseHandler.h

@@ -4,8 +4,8 @@
  * 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 FullParseHandler_h__
-#define FullParseHandler_h__
+#ifndef frontend_FullParseHandler_h
+#define frontend_FullParseHandler_h
 
 #include "mozilla/PodOperations.h"
 
@@ -542,4 +542,4 @@ FullParseHandler::makeAssignment(ParseNode *pn, ParseNode *rhs)
 } // frontend
 } // js
 
-#endif /* FullParseHandler_h__ */
+#endif /* frontend_FullParseHandler_h */

js/src/frontend/NameFunctions.h

@@ -4,8 +4,8 @@
  * 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 NameFunctions_h__
-#define NameFunctions_h__
+#ifndef frontend_NameFunctions_h
+#define frontend_NameFunctions_h
 
 struct JSContext;
 
@@ -20,4 +20,4 @@ NameFunctions(JSContext *cx, ParseNode *pn);
 } /* namespace frontend */
 } /* namespace js */
 
-#endif /* NameFunctions_h__ */
+#endif /* frontend_NameFunctions_h */

js/src/frontend/ParseMaps-inl.h

@@ -4,8 +4,8 @@
  * 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 ParseMapPool_inl_h__
-#define ParseMapPool_inl_h__
+#ifndef frontend_ParseMaps_inl_h
+#define frontend_ParseMaps_inl_h
 
 #include "jscntxt.h"
 
@@ -119,4 +119,4 @@ AtomDecls<ParseHandler>::~AtomDecls()
 } /* namespace frontend */
 } /* namespace js */
 
-#endif
+#endif /* frontend_ParseMaps_inl_h */

js/src/frontend/ParseMaps.h

@@ -4,8 +4,8 @@
  * 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 ParseMaps_h__
-#define ParseMaps_h__
+#ifndef frontend_ParseMaps_h
+#define frontend_ParseMaps_h
 
 #include "mozilla/Attributes.h"
 #include "mozilla/TypeTraits.h"
@@ -468,4 +468,4 @@ struct IsPod<js::frontend::DefinitionList> : TrueType {};
 
 } /* namespace mozilla */
 
-#endif
+#endif /* frontend_ParseMaps_h */

js/src/frontend/ParseNode-inl.h

@@ -4,8 +4,8 @@
  * 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 ParseNode_inl_h__
-#define ParseNode_inl_h__
+#ifndef frontend_ParseNode_inl_h
+#define frontend_ParseNode_inl_h
 
 #include "frontend/ParseNode.h"
 #include "frontend/SharedContext.h"
@@ -47,4 +47,4 @@ ParseNode::atom() const
 } /* namespace frontend */
 } /* namespace js */
 
-#endif /* ParseNode_inl_h__ */
+#endif /* frontend_ParseNode_inl_h */

js/src/frontend/ParseNode.h

@@ -4,8 +4,8 @@
  * 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 ParseNode_h__
-#define ParseNode_h__
+#ifndef frontend_ParseNode_h
+#define frontend_ParseNode_h
 
 #include "mozilla/Attributes.h"
 
@@ -1427,4 +1427,4 @@ enum FunctionSyntaxKind { Expression, Statement, Arrow };
 } /* namespace frontend */
 } /* namespace js */
 
-#endif /* ParseNode_h__ */
+#endif /* frontend_ParseNode_h */

js/src/frontend/Parser-inl.h

@@ -4,8 +4,8 @@
  * 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 Parser_inl_h__
-#define Parser_inl_h__
+#ifndef frontend_Parser_inl
+#define frontend_Parser_inl
 
 #include "frontend/BytecodeCompiler.h"
 #include "frontend/Parser.h"
@@ -118,5 +118,4 @@ CheckStrictBinding(JSContext *cx, ParseHandler *handler, ParseContext<ParseHandl
 } // namespace frontend
 } // namespace js
 
-#endif // Parser_inl_h__
-
+#endif /* frontend_Parser_inl */

js/src/frontend/Parser.h

@@ -4,8 +4,8 @@
  * 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 Parser_h__
-#define Parser_h__
+#ifndef frontend_Parser_h
+#define frontend_Parser_h
 
 /*
  * JS parser definitions.
@@ -566,4 +566,4 @@ Parser<SyntaxParseHandler>::setAssignmentLhsOps(Node pn, JSOp op);
  */
 #define TS(p) (&(p)->tokenStream)
 
-#endif /* Parser_h__ */
+#endif /* frontend_Parser_h */

js/src/frontend/SharedContext-inl.h

@@ -4,8 +4,8 @@
  * 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 SharedContext_inl_h__
-#define SharedContext_inl_h__
+#ifndef frontend_SharedContext_inl_h
+#define frontend_SharedContext_inl_h
 
 #include "frontend/Parser.h"
 #include "frontend/SharedContext.h"
@@ -95,4 +95,4 @@ frontend::FinishPopStatement(ContextT *ct)
 
 } // namespace js
 
-#endif // SharedContext_inl_h__
+#endif /* frontend_SharedContext_inl_h */

js/src/frontend/SharedContext.h

@@ -4,8 +4,8 @@
  * 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 SharedContext_h__
-#define SharedContext_h__
+#ifndef frontend_SharedContext_h
+#define frontend_SharedContext_h
 
 #include "jstypes.h"
 #include "jsatom.h"
@@ -384,4 +384,4 @@ LexicalLookup(ContextT *ct, HandleAtom atom, int *slotp, typename ContextT::Stmt
 
 } // namespace js
 
-#endif // SharedContext_h__
+#endif /* frontend_SharedContext_h */

js/src/frontend/SourceNotes.h

@@ -4,8 +4,8 @@
  * 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 SourceNotes_h__
-#define SourceNotes_h__
+#ifndef frontend_SourceNotes_h
+#define frontend_SourceNotes_h
 
 #include "jsprvtd.h"
 
@@ -159,4 +159,4 @@ extern JS_FRIEND_API(unsigned)         js_SrcNoteLength(jssrcnote *sn);
 extern JS_FRIEND_API(ptrdiff_t)
 js_GetSrcNoteOffset(jssrcnote *sn, unsigned which);
 
-#endif  // SourceNotes_h__
+#endif /* frontend_SourceNotes_h */

js/src/frontend/SyntaxParseHandler.h

@@ -4,8 +4,8 @@
  * 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 SyntaxParseHandler_h__
-#define SyntaxParseHandler_h__
+#ifndef frontend_SyntaxParseHandler_h
+#define frontend_SyntaxParseHandler_h
 
 namespace js {
 namespace frontend {
@@ -216,4 +216,4 @@ class SyntaxParseHandler
 } // namespace frontend
 } // namespace js
 
-#endif /* SyntaxParseHandler_h__ */
+#endif /* frontend_SyntaxParseHandler_h */

js/src/frontend/TokenStream.h

@@ -4,8 +4,8 @@
  * 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 TokenStream_h__
-#define TokenStream_h__
+#ifndef frontend_TokenStream_h
+#define frontend_TokenStream_h
 
 /*
  * JS lexical scanner interface.
@@ -956,4 +956,4 @@ extern const char *
 TokenKindToString(js::frontend::TokenKind tt);
 #endif
 
-#endif /* TokenStream_h__ */
+#endif /* frontend_TokenStream_h */