Bug 883697 (part 1) - Make include guards consistent in js/ductwork/, js/ipc/ and js/public/. r=njn.

--HG--
extra : rebase_source : 34f5559ba6e64831905686e12356b70109d873a8

js/ductwork/debugger/JSDebugger.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 COMPONENTS_JSDEBUGGER_H
-#define COMPONENTS_JSDEBUGGER_H
+#ifndef JSDebugger_h
+#define JSDebugger_h
 
 #include "IJSDebugger.h"
 #include "mozilla/Attributes.h"
@@ -27,4 +27,4 @@ private:
 }
 }
 
-#endif
+#endif /* JSDebugger_h */

js/ipc/CPOWTypes.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 mozilla_jsipc_ContextWrapperTypes_h__
-#define mozilla_jsipc_ContextWrapperTypes_h__
+#ifndef mozilla_jsipc_CPOWTypes_h
+#define mozilla_jsipc_CPOWTypes_h
 
 #include "jsapi.h"
 #include "jspubtd.h"
@@ -61,4 +61,4 @@ template <> struct ParamTraits<JSType> : public mozilla::jsipc::CPOWConvertible<
 #define JSVAL_TO_CSTR(CX, V) ((char*)0)
 #endif
 
-#endif
+#endif /* mozilla_jsipc_CPOWTypes_h */

js/ipc/ContextWrapperChild.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 mozilla_jsipc_ContextWrapperChild_h__
-#define mozilla_jsipc_ContextWrapperChild_h__
+#ifndef mozilla_jsipc_ContextWrapperChild_h
+#define mozilla_jsipc_ContextWrapperChild_h
 
 #include "mozilla/jsipc/PContextWrapperChild.h"
 #include "mozilla/jsipc/ObjectWrapperChild.h"
@@ -77,4 +77,4 @@ private:
 
 }}
 
-#endif
+#endif /* mozilla_jsipc_ContextWrapperChild_h */

js/ipc/ContextWrapperParent.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 mozilla_jsipc_ContextWrapperParent_h__
-#define mozilla_jsipc_ContextWrapperParent_h__
+#ifndef mozilla_jsipc_ContextWrapperParent_h
+#define mozilla_jsipc_ContextWrapperParent_h
 
 #include "mozilla/jsipc/PContextWrapperParent.h"
 #include "mozilla/jsipc/ObjectWrapperParent.h"
@@ -82,4 +82,4 @@ private:
 
 }}
 
-#endif
+#endif /* mozilla_jsipc_ContextWrapperParent_h */

js/ipc/ObjectWrapperChild.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 mozilla_jsipc_ObjectWrapperChild_h__
-#define mozilla_jsipc_ObjectWrapperChild_h__
+#ifndef mozilla_jsipc_ObjectWrapperChild_h
+#define mozilla_jsipc_ObjectWrapperChild_h
 
 #include "mozilla/jsipc/PObjectWrapperChild.h"
 
@@ -90,4 +90,4 @@ protected:
 
 }}
   
-#endif
+#endif /* mozilla_jsipc_ObjectWrapperChild_h */

js/ipc/ObjectWrapperParent.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 mozilla_jsipc_ObjectWrapperParent_h__
-#define mozilla_jsipc_ObjectWrapperParent_h__
+#ifndef mozilla_jsipc_ObjectWrapperParent_h
+#define mozilla_jsipc_ObjectWrapperParent_h
 
 #include "mozilla/jsipc/PObjectWrapperParent.h"
 #include "jsapi.h"
@@ -142,4 +142,4 @@ public:
 
 }}
 
-#endif
+#endif /* mozilla_jsipc_ObjectWrapperParent_h */

js/public/Anchor.h

@@ -6,8 +6,8 @@
 
 /* JS::Anchor implementation. */
 
-#ifndef js_Anchor_h___
-#define js_Anchor_h___
+#ifndef js_Anchor_h
+#define js_Anchor_h
 
 #include "mozilla/Attributes.h"
 
@@ -159,4 +159,4 @@ inline Anchor<T>::~Anchor()
 
 } // namespace JS
 
-#endif /* js_Anchor_h___ */
+#endif /* js_Anchor_h */

js/public/CallArgs.h

@@ -26,8 +26,8 @@
  * methods' implementations, potentially under time pressure.
  */
 
-#ifndef js_CallArgs_h___
-#define js_CallArgs_h___
+#ifndef js_CallArgs_h
+#define js_CallArgs_h
 
 #include "mozilla/Assertions.h"
 #include "mozilla/Attributes.h"
@@ -400,4 +400,4 @@ JS_THIS(JSContext *cx, JS::Value *vp)
  */
 #define JS_THIS_VALUE(cx,vp)    ((vp)[1])
 
-#endif /* js_CallArgs_h___ */
+#endif /* js_CallArgs_h */

js/public/CharacterEncoding.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 js_CharacterEncoding_h___
-#define js_CharacterEncoding_h___
+#ifndef js_CharacterEncoding_h
+#define js_CharacterEncoding_h
 
 #include "mozilla/Range.h"
 
@@ -152,4 +152,4 @@ TwoByteCharsToNewUTF8CharsZ(JSContext *cx, TwoByteChars tbchars);
 inline void JS_free(JS::Latin1CharsZ &ptr) { js_free((void*)ptr.get()); }
 inline void JS_free(JS::UTF8CharsZ &ptr) { js_free((void*)ptr.get()); }
 
-#endif // js_CharacterEncoding_h___
+#endif /* js_CharacterEncoding_h */

js/public/Date.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 js_Date_h___
-#define js_Date_h___
+#ifndef js_Date_h
+#define js_Date_h
 
 #include "jstypes.h"
 
@@ -32,4 +32,4 @@ DayFromTime(double time);
 
 } // namespace JS
 
-#endif /* js_Date_h___ */
+#endif /* js_Date_h */

js/public/GCAPI.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 js_gc_api_h___
-#define js_gc_api_h___
+#ifndef js_GCAPI_h
+#define js_GCAPI_h
 
 #include "HeapAPI.h"
 
@@ -291,4 +291,4 @@ ExposeValueToActiveJS(const Value &v)
 
 } /* namespace JS */
 
-#endif /* js_gc_api_h___ */
+#endif /* js_GCAPI_h */

js/public/HashTable.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 js_HashTable_h__
-#define js_HashTable_h__
+#ifndef js_HashTable_h
+#define js_HashTable_h
 
 #include "mozilla/Assertions.h"
 #include "mozilla/Attributes.h"
@@ -1464,5 +1464,4 @@ class HashTable : private AllocPolicy
 }  // namespace detail
 }  // namespace js
 
-#endif  // js_HashTable_h__
-
+#endif  /* js_HashTable_h */

js/public/HeapAPI.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 js_heap_api_h___
-#define js_heap_api_h___
+#ifndef js_HeapAPI_h
+#define js_HeapAPI_h
 
 #include "jspubtd.h"
 
@@ -159,4 +159,4 @@ IsIncrementalBarrierNeededOnGCThing(shadow::Runtime *rt, void *thing, JSGCTraceK
 
 } /* namespace JS */
 
-#endif /* js_heap_api_h___ */
+#endif /* js_HeapAPI_h */

js/public/LegacyIntTypes.h

@@ -20,8 +20,8 @@
  *         It is safest to use only the JSAPI <stdint.h>-style types,
  *         customizing those types using MOZ_CUSTOM_STDINT_H if necessary.
  */
-#ifndef PROTYPES_H
-#define PROTYPES_H
+#ifndef js_LegacyIntTypes_h
+#define js_LegacyIntTypes_h
 
 #include "mozilla/StandardInteger.h"
 
@@ -57,4 +57,4 @@ typedef int16_t JSInt16;
 typedef int32_t JSInt32;
 typedef int64_t JSInt64;
 
-#endif /* !defined(PROTYPES_H) */
+#endif /* js_LegacyIntTypes_h */

js/public/MemoryMetrics.h

@@ -457,4 +457,4 @@ PeakSizeOfTemporary(const JSRuntime *rt);
 
 } // namespace JS
 
-#endif // js_MemoryMetrics_h
+#endif /* js_MemoryMetrics_h */

js/public/PropertyKey.h

@@ -6,8 +6,8 @@
 
 /* JS::PropertyKey implementation. */
 
-#ifndef js_PropertyKey_h___
-#define js_PropertyKey_h___
+#ifndef js_PropertyKey_h
+#define js_PropertyKey_h
 
 #include "mozilla/Attributes.h"
 
@@ -95,4 +95,4 @@ ToPropertyKey(JSContext *cx, HandleValue v, PropertyKey *key)
 
 } // namespace JS
 
-#endif /* js_PropertyKey_h___ */
+#endif /* js_PropertyKey_h */

js/public/RequiredDefines.h

@@ -10,8 +10,8 @@
  * or SpiderMonkey public headers may not work correctly.
  */
 
-#ifndef js_RequiredDefines_h___
-#define js_RequiredDefines_h___
+#ifndef js_RequiredDefines_h
+#define js_RequiredDefines_h
 
 /*
  * The c99 defining the limit macros (UINT32_MAX for example), says:
@@ -20,4 +20,4 @@
  */
 #define __STDC_LIMIT_MACROS
 
-#endif /* js_RequiredDefines_h___ */
+#endif /* js_RequiredDefines_h */

js/public/RootingAPI.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 jsgc_root_h__
-#define jsgc_root_h__
+#ifndef js_RootingAPI_h
+#define js_RootingAPI_h
 
 #include "mozilla/GuardObjects.h"
 #include "mozilla/TypeTraits.h"
@@ -931,4 +931,4 @@ class CompilerRootNode
 
 }  /* namespace js */
 
-#endif  /* jsgc_root_h___ */
+#endif  /* js_RootingAPI_h */

js/public/TemplateLib.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 js_template_lib_h__
-#define js_template_lib_h__
+#ifndef js_TemplateLib_h
+#define js_TemplateLib_h
 
 #include "jstypes.h"
 
@@ -114,4 +114,4 @@ template <class T> struct IsRelocatableHeapType { static const bool result = tru
 } /* namespace tl */
 } /* namespace js */
 
-#endif  /* js_template_lib_h__ */
+#endif  /* js_TemplateLib_h */

js/public/Utility.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 js_utility_h__
-#define js_utility_h__
+#ifndef js_Utility_h
+#define js_Utility_h
 
 #include "mozilla/Assertions.h"
 #include "mozilla/Attributes.h"
@@ -860,4 +860,4 @@ typedef size_t(*JSMallocSizeOfFun)(const void *p);
 # define STATIC_SKIP_INFERENCE STATIC_INVARIANT(skip_inference())
 #endif /* HAVE_STATIC_ANNOTATIONS */
 
-#endif /* js_utility_h__ */
+#endif /* js_Utility_h */

js/public/Value.h

@@ -6,8 +6,8 @@
 
 /* JS::Value implementation. */
 
-#ifndef js_Value_h___
-#define js_Value_h___
+#ifndef js_Value_h
+#define js_Value_h
 
 #include "mozilla/Attributes.h"
 #include "mozilla/FloatingPoint.h"
@@ -1832,4 +1832,4 @@ JSVAL_TO_PRIVATE(jsval v)
     return JSVAL_TO_PRIVATE_PTR_IMPL(JSVAL_TO_IMPL(v));
 }
 
-#endif /* js_Value_h___ */
+#endif /* js_Value_h */

js/public/Vector.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 jsvector_h_
-#define jsvector_h_
+#ifndef js_Vector_h
+#define js_Vector_h
 
 #include "mozilla/Attributes.h"
 #include "mozilla/TypeTraits.h"
@@ -1104,4 +1104,4 @@ Vector<T,N,AP>::swap(Vector &other)
 #pragma warning(pop)
 #endif
 
-#endif /* jsvector_h_ */
+#endif /* js_Vector_h */