Bug 896341 - Update include guards and modelines in MFBT; r=Waldo

mfbt/AllocPolicy.h

@@ -1,4 +1,5 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=8 sts=2 et sw=2 tw=80: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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/. */
@@ -8,8 +9,8 @@
  * control how memory is allocated and how failures are handled.
  */
 
-#ifndef mozilla_AllocPolicy_h_
+#ifndef mozilla_AllocPolicy_h
-#define mozilla_AllocPolicy_h_
+#define mozilla_AllocPolicy_h
 
 #include <stddef.h>
 #include <stdlib.h>
@@ -59,4 +60,4 @@ class MallocAllocPolicy
 
 } // namespace mozilla
 
-#endif // mozilla_AllocPolicy_h_
+#endif /* mozilla_AllocPolicy_h */

mfbt/Array.h

@@ -1,12 +1,13 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=8 sts=2 et sw=2 tw=80: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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/. */
 
 /* A compile-time constant-length array with bounds-checking assertions. */
 
-#ifndef mozilla_Array_h_
+#ifndef mozilla_Array_h
-#define mozilla_Array_h_
+#define mozilla_Array_h
 
 #include "mozilla/Assertions.h"
 #include "mozilla/Attributes.h"
@@ -47,4 +48,4 @@ class Array<T, 0>
 
 }  /* namespace mozilla */
 
-#endif /* mozilla_Array_h_ */
+#endif /* mozilla_Array_h */

mfbt/Assertions.h

@@ -1,12 +1,13 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=8 sts=2 et sw=2 tw=80: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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/. */
 
 /* Implementations of runtime and static assertion macros for C and C++. */
 
-#ifndef mozilla_Assertions_h_
+#ifndef mozilla_Assertions_h
-#define mozilla_Assertions_h_
+#define mozilla_Assertions_h
 
 #include "mozilla/Attributes.h"
 #include "mozilla/Compiler.h"
@@ -455,4 +456,4 @@ __declspec(noreturn) __inline void MOZ_NoReturn() {}
 #  define MOZ_ALWAYS_FALSE(expr)     ((void)(expr))
 #endif
 
-#endif /* mozilla_Assertions_h_ */
+#endif /* mozilla_Assertions_h */

mfbt/Atomics.h

@@ -1,4 +1,5 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=8 sts=2 et sw=2 tw=80: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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/. */
@@ -12,8 +13,8 @@
  * sent a copy of this header and the C++11 standard.
  */
 
-#ifndef mozilla_Atomics_h_
+#ifndef mozilla_Atomics_h
-#define mozilla_Atomics_h_
+#define mozilla_Atomics_h
 
 #include "mozilla/Assertions.h"
 #include "mozilla/TypeTraits.h"
@@ -957,4 +958,4 @@ class Atomic<T*, Order> : public detail::AtomicBase<T*, Order>
 
 } // namespace mozilla
 
-#endif /* mozilla_Atomics_h_ */
+#endif /* mozilla_Atomics_h */

mfbt/Attributes.h

@@ -1,12 +1,13 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=8 sts=2 et sw=2 tw=80: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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/. */
 
 /* Implementations of various class and method modifier attributes. */
 
-#ifndef mozilla_Attributes_h_
+#ifndef mozilla_Attributes_h
-#define mozilla_Attributes_h_
+#define mozilla_Attributes_h
 
 #include "mozilla/Compiler.h"
 
@@ -427,4 +428,4 @@
 
 #endif /* __cplusplus */
 
-#endif  /* mozilla_Attributes_h_ */
+#endif /* mozilla_Attributes_h */

mfbt/BloomFilter.h

@@ -1,7 +1,8 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=8 sts=2 et sw=2 tw=80: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /*
  * A counting Bloom filter implementation.  This allows consumers to
@@ -10,8 +11,8 @@
  * incorrectly answer "yes" when the correct answer is "no").
  */
 
-#ifndef mozilla_BloomFilter_h_
+#ifndef mozilla_BloomFilter_h
-#define mozilla_BloomFilter_h_
+#define mozilla_BloomFilter_h
 
 #include "mozilla/Assertions.h"
 #include "mozilla/Likely.h"
@@ -231,4 +232,4 @@ BloomFilter<KeySize, T>::mightContain(const T* t) const
 
 } // namespace mozilla
 
-#endif /* mozilla_BloomFilter_h_ */
+#endif /* mozilla_BloomFilter_h */

mfbt/Casting.h

@@ -1,12 +1,13 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=8 sts=2 et sw=2 tw=80: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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/. */
 
 /* Cast operations to supplement the built-in casting operations. */
 
-#ifndef mozilla_Casting_h_
+#ifndef mozilla_Casting_h
-#define mozilla_Casting_h_
+#define mozilla_Casting_h
 
 #include "mozilla/Assertions.h"
 #include "mozilla/TypeTraits.h"
@@ -198,4 +199,4 @@ SafeCast(const From from)
 
 } // namespace mozilla
 
-#endif  /* mozilla_Casting_h_ */
+#endif /* mozilla_Casting_h */

mfbt/Char16.h

@@ -1,12 +1,13 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=8 sts=2 et sw=2 tw=80: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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/. */
 
 /* Implements a UTF-16 character type. */
 
-#ifndef mozilla_Char16_h_
+#ifndef mozilla_Char16_h
-#define mozilla_Char16_h_
+#define mozilla_Char16_h
 
 #include "mozilla/Assertions.h"
 
@@ -53,4 +54,4 @@ MOZ_STATIC_ASSERT(sizeof(char16_t) == 2, "Is char16_t type 16 bits?");
 MOZ_STATIC_ASSERT(sizeof(MOZ_UTF16('A')) == 2, "Is char literal 16 bits?");
 MOZ_STATIC_ASSERT(sizeof(MOZ_UTF16("")[0]) == 2, "Is string char 16 bits?");
 
-#endif /* mozilla_Char16_h_ */
+#endif /* mozilla_Char16_h */

mfbt/CheckedInt.h

@@ -1,12 +1,13 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=8 sts=2 et sw=2 tw=80: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* Provides checked integers, detecting integer overflow and divide-by-0. */
 
-#ifndef mozilla_CheckedInt_h_
+#ifndef mozilla_CheckedInt_h
-#define mozilla_CheckedInt_h_
+#define mozilla_CheckedInt_h
 
 // Enable relying of Mozilla's MFBT for possibly-available C++11 features
 #define MOZ_CHECKEDINT_USE_MFBT
@@ -875,4 +876,4 @@ typedef CheckedInt<uint64_t> CheckedUint64;
 
 } // namespace mozilla
 
-#endif /* mozilla_CheckedInt_h_ */
+#endif /* mozilla_CheckedInt_h */

mfbt/Compiler.h

@@ -1,12 +1,13 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=8 sts=2 et sw=2 tw=80: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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/. */
 
 /* Various compiler checks. */
 
-#ifndef mozilla_Compiler_h_
+#ifndef mozilla_Compiler_h
-#define mozilla_Compiler_h_
+#define mozilla_Compiler_h
 
 #if !defined(__clang__) && defined(__GNUC__)
 
@@ -28,4 +29,4 @@
 
 #endif
 
-#endif  /* mozilla_Compiler_h_ */
+#endif /* mozilla_Compiler_h */

mfbt/Constants.h

@@ -1,15 +1,16 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=8 sts=2 et sw=2 tw=80: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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/. */
 
 /* mfbt math constants. */
 
-#ifndef mozilla_Constants_h_
+#ifndef mozilla_Constants_h
-#define mozilla_Constants_h_
+#define mozilla_Constants_h
 
 #ifndef M_PI
 #  define M_PI 3.14159265358979323846
 #endif
 
-#endif  /* mozilla_Constants_h_ */
+#endif /* mozilla_Constants_h */

mfbt/DebugOnly.h

@@ -1,4 +1,5 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=8 sts=2 et sw=2 tw=80: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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/. */
@@ -8,8 +9,8 @@
  * assertions).
  */
 
-#ifndef mozilla_DebugOnly_h_
+#ifndef mozilla_DebugOnly_h
-#define mozilla_DebugOnly_h_
+#define mozilla_DebugOnly_h
 
 namespace mozilla {
 
@@ -74,4 +75,4 @@ class DebugOnly
 
 }
 
-#endif  /* mozilla_DebugOnly_h_ */
+#endif /* mozilla_DebugOnly_h */

mfbt/Endian.h

@@ -1,4 +1,5 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=8 sts=2 et sw=2 tw=80: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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/. */
@@ -59,8 +60,8 @@
  * };
  */
 
-#ifndef mozilla_Endian_h_
+#ifndef mozilla_Endian_h
-#define mozilla_Endian_h_
+#define mozilla_Endian_h
 
 #include "mozilla/Assertions.h"
 #include "mozilla/Attributes.h"
@@ -636,4 +637,4 @@ class NativeEndian MOZ_FINAL : public detail::Endian<MOZ_NATIVE_ENDIANNESS>
 
 } /* namespace mozilla */
 
-#endif /* mozilla_Endian_h_ */
+#endif /* mozilla_Endian_h */

mfbt/EnumSet.h

@@ -1,4 +1,5 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=8 sts=2 et sw=2 tw=80: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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/. */
@@ -172,4 +173,4 @@ class EnumSet
 
 } // namespace mozilla
 
-#endif // mozilla_EnumSet_h_
+#endif /* mozilla_EnumSet_h_*/

mfbt/FloatingPoint.h

@@ -1,12 +1,13 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=8 sts=2 et sw=2 tw=80: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* Various predicates and operations on IEEE-754 floating point types. */
 
-#ifndef mozilla_FloatingPoint_h_
+#ifndef mozilla_FloatingPoint_h
-#define mozilla_FloatingPoint_h_
+#define mozilla_FloatingPoint_h
 
 #include "mozilla/Assertions.h"
 #include "mozilla/Attributes.h"
@@ -206,4 +207,4 @@ DoublesAreIdentical(double d1, double d2)
 
 } /* namespace mozilla */
 
-#endif  /* mozilla_FloatingPoint_h_ */
+#endif /* mozilla_FloatingPoint_h */

mfbt/GuardObjects.h

@@ -1,4 +1,5 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=8 sts=2 et sw=2 tw=80: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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/. */

mfbt/HashFunctions.h

@@ -1,7 +1,8 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=8 sts=2 et sw=2 tw=80: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* Utilities for hashing. */
 
@@ -42,8 +43,8 @@
  * in nsHashKeys.h.
  */
 
-#ifndef mozilla_HashFunctions_h_
+#ifndef mozilla_HashFunctions_h
-#define mozilla_HashFunctions_h_
+#define mozilla_HashFunctions_h
 
 #include "mozilla/Assertions.h"
 #include "mozilla/Attributes.h"
@@ -356,4 +357,5 @@ HashBytes(const void* bytes, size_t length);
 
 } /* namespace mozilla */
 #endif /* __cplusplus */
-#endif /* mozilla_HashFunctions_h_ */
+
+#endif /* mozilla_HashFunctions_h */

mfbt/Likely.h

@@ -1,15 +1,16 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=8 sts=2 et sw=2 tw=80: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /*
  * MOZ_LIKELY and MOZ_UNLIKELY macros to hint to the compiler how a
  * boolean predicate should be branch-predicted.
  */
 
-#ifndef mozilla_Likely_h_
+#ifndef mozilla_Likely_h
-#define mozilla_Likely_h_
+#define mozilla_Likely_h
 
 #if defined(__clang__) || defined(__GNUC__)
 #  define MOZ_LIKELY(x)   (__builtin_expect(!!(x), 1))
@@ -19,4 +20,4 @@
 #  define MOZ_UNLIKELY(x) (!!(x))
 #endif
 
-#endif /* mozilla_Likely_h_ */
+#endif /* mozilla_Likely_h */

mfbt/LinkedList.h

@@ -1,4 +1,5 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=8 sts=2 et sw=2 tw=80: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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/. */
@@ -52,8 +53,8 @@
  *
  */
 
-#ifndef mozilla_LinkedList_h_
+#ifndef mozilla_LinkedList_h
-#define mozilla_LinkedList_h_
+#define mozilla_LinkedList_h
 
 #include "mozilla/Assertions.h"
 #include "mozilla/Attributes.h"
@@ -423,5 +424,6 @@ class LinkedList
 
 } /* namespace mozilla */
 
-#endif /* ifdef __cplusplus */
+#endif /* __cplusplus */
-#endif /* ifdef mozilla_LinkedList_h_ */
+
+#endif /* mozilla_LinkedList_h */

mfbt/MathAlgorithms.h

@@ -1,12 +1,13 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=8 sts=2 et sw=2 tw=80: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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/. */
 
 /* mfbt maths algorithms. */
 
-#ifndef mozilla_MathAlgorithms_h_
+#ifndef mozilla_MathAlgorithms_h
-#define mozilla_MathAlgorithms_h_
+#define mozilla_MathAlgorithms_h
 
 #include "mozilla/Assertions.h"
 #include "mozilla/StandardInteger.h"
@@ -425,4 +426,4 @@ RoundUpPow2(size_t x)
 
 } /* namespace mozilla */
 
-#endif  /* mozilla_MathAlgorithms_h_ */
+#endif /* mozilla_MathAlgorithms_h */

mfbt/MemoryChecking.h

@@ -1,4 +1,5 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=8 sts=2 et sw=2 tw=80: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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/. */
@@ -19,8 +20,8 @@
  * With no memory checker available, all macros expand to the empty statement.
  */
 
-#ifndef mozilla_MemoryChecking_h_
+#ifndef mozilla_MemoryChecking_h
-#define mozilla_MemoryChecking_h_
+#define mozilla_MemoryChecking_h
 
 #if defined(MOZ_VALGRIND)
 #include "valgrind/memcheck.h"
@@ -68,4 +69,4 @@ extern "C" {
 
 #endif
 
-#endif  /* mozilla_MemoryChecking_h_ */
+#endif /* mozilla_MemoryChecking_h */

mfbt/MemoryReporting.h

@@ -6,8 +6,8 @@
 
 /* Memory reporting infrastructure. */
 
-#ifndef mozilla_MemoryReporting_h_
+#ifndef mozilla_MemoryReporting_h
-#define mozilla_MemoryReporting_h_
+#define mozilla_MemoryReporting_h
 
 #include <stddef.h>
 
@@ -27,4 +27,4 @@ typedef size_t (*MallocSizeOf)(const void* p);
 
 typedef size_t (*MozMallocSizeOf)(const void* p);
 
-#endif /* mozilla_MemoryReporting_h_ */
+#endif /* mozilla_MemoryReporting_h */

mfbt/Move.h

@@ -1,12 +1,13 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=8 sts=2 et sw=2 tw=80: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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/. */
 
 /* C++11-style, but C++98-usable, "move references" implementation. */
 
-#ifndef mozilla_Move_h_
+#ifndef mozilla_Move_h
-#define mozilla_Move_h_
+#define mozilla_Move_h
 
 namespace mozilla {
 
@@ -162,4 +163,4 @@ Swap(T& t, T& u)
 
 } // namespace mozilla
 
-#endif // mozilla_Move_h_
+#endif /* mozilla_Move_h */

mfbt/NullPtr.h

@@ -1,4 +1,5 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=8 sts=2 et sw=2 tw=80: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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/. */
@@ -8,8 +9,8 @@
  * constant.
  */
 
-#ifndef mozilla_NullPtr_h_
+#ifndef mozilla_NullPtr_h
-#define mozilla_NullPtr_h_
+#define mozilla_NullPtr_h
 
 #include "mozilla/Compiler.h"
 
@@ -45,4 +46,4 @@
 #  endif
 #endif
 
-#endif  /* mozilla_NullPtr_h_ */
+#endif /* mozilla_NullPtr_h */

mfbt/PodOperations.h

@@ -1,4 +1,5 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=8 sts=2 et sw=2 tw=80: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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/. */
@@ -156,4 +157,4 @@ PodEqual(const T* one, const T* two, size_t len)
 
 } // namespace mozilla
 
-#endif // mozilla_PodOperations_h_
+#endif /* mozilla_PodOperations_h */

mfbt/Poison.h

@@ -9,8 +9,8 @@
  * an address that leads to a safe crash when dereferenced.
  */
 
-#ifndef mozilla_Poison_h_
+#ifndef mozilla_Poison_h
-#define mozilla_Poison_h_
+#define mozilla_Poison_h
 
 #include "mozilla/Assertions.h"
 #include "mozilla/StandardInteger.h"
@@ -58,4 +58,4 @@ extern MFBT_DATA uintptr_t gMozillaPoisonSize;
 
 MOZ_END_EXTERN_C
 
-#endif /* mozilla_Poison_h_ */
+#endif /* mozilla_Poison_h */

mfbt/Range.h

@@ -1,12 +1,11 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
- * vim: set ts=8 sw=4 et tw=78:
+/* vim: set ts=8 sts=2 et sw=2 tw=80: */
- *
+/* This Source Code Form is subject to the terms of the Mozilla Public
- * This Source Code Form is subject to the terms of the Mozilla Public
  * 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_Range_h_
+#ifndef mozilla_Range_h
-#define mozilla_Range_h_
+#define mozilla_Range_h
 
 #include "mozilla/NullPtr.h"
 #include "mozilla/RangedPtr.h"
@@ -45,5 +44,4 @@ class Range
 
 } // namespace mozilla
 
-#endif // mozilla_Range_h_
+#endif /* mozilla_Range_h */
-

mfbt/RangedPtr.h

@@ -1,4 +1,5 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=8 sts=2 et sw=2 tw=80: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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/. */
@@ -8,8 +9,8 @@
  * construction.
  */
 
-#ifndef mozilla_RangedPtr_h_
+#ifndef mozilla_RangedPtr_h
-#define mozilla_RangedPtr_h_
+#define mozilla_RangedPtr_h
 
 #include "mozilla/Assertions.h"
 #include "mozilla/Attributes.h"
@@ -251,4 +252,4 @@ class RangedPtr
 
 } /* namespace mozilla */
 
-#endif  /* mozilla_RangedPtr_h_ */
+#endif /* mozilla_RangedPtr_h */

mfbt/ReentrancyGuard.h

@@ -1,12 +1,13 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=8 sts=2 et sw=2 tw=80: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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/. */
 
 /* Small helper class for asserting uses of a class are non-reentrant. */
 
-#ifndef mozilla_ReentrancyGuard_h_
+#ifndef mozilla_ReentrancyGuard_h
-#define mozilla_ReentrancyGuard_h_
+#define mozilla_ReentrancyGuard_h
 
 #include "mozilla/Assertions.h"
 #include "mozilla/Attributes.h"
@@ -53,4 +54,4 @@ class ReentrancyGuard
 
 } // namespace mozilla
 
-#endif // mozilla_ReentrancyGuard_h_
+#endif /* mozilla_ReentrancyGuard_h */

mfbt/RefPtr.h

@@ -1,12 +1,13 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=8 sts=2 et sw=2 tw=80: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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/. */
 
 /* Helpers for defining and using refcounted objects. */
 
-#ifndef mozilla_RefPtr_h_
+#ifndef mozilla_RefPtr_h
-#define mozilla_RefPtr_h_
+#define mozilla_RefPtr_h
 
 #include "mozilla/Assertions.h"
 #include "mozilla/Atomics.h"
@@ -290,9 +291,6 @@ byRef(RefPtr<T>& ptr)
 
 } // namespace mozilla
 
-#endif // mozilla_RefPtr_h_
-
-
 #if 0
 
 // Command line that builds these tests
@@ -447,3 +445,5 @@ main(int argc, char** argv)
 }
 
 #endif
+
+#endif /* mozilla_RefPtr_h */

mfbt/SHA1.h

@@ -1,12 +1,13 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=8 sts=2 et sw=2 tw=80: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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/. */
 
 /* Simple class for computing SHA1. */
 
-#ifndef mozilla_SHA1_h_
+#ifndef mozilla_SHA1_h
-#define mozilla_SHA1_h_
+#define mozilla_SHA1_h
 
 #include "mozilla/StandardInteger.h"
 #include "mozilla/Types.h"
@@ -58,4 +59,4 @@ class SHA1Sum
 
 } /* namespace mozilla */
 
-#endif /* mozilla_SHA1_h_ */
+#endif /* mozilla_SHA1_h */

mfbt/Scoped.h

@@ -1,11 +1,13 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=8 sts=2 et sw=2 tw=80: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* A number of structures to simplify scope-based RAII management. */
 
-#ifndef mozilla_Scoped_h_
+#ifndef mozilla_Scoped_h
-#define mozilla_Scoped_h_
+#define mozilla_Scoped_h
 
 /*
  * Resource Acquisition Is Initialization is a programming idiom used
@@ -268,4 +270,4 @@ SCOPED_TEMPLATE(TypeSpecificScopedPointer, TypeSpecificScopedPointerTraits)
 
 } /* namespace mozilla */
 
-#endif // mozilla_Scoped_h_
+#endif /* mozilla_Scoped_h */

mfbt/SplayTree.h

@@ -1,7 +1,6 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
- * vim: set ts=8 sw=4 et tw=99 ft=cpp:
+/* vim: set ts=8 sts=2 et sw=2 tw=80: */
- *
+/* This Source Code Form is subject to the terms of the Mozilla Public
- * This Source Code Form is subject to the terms of the Mozilla Public
  * 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/. */
 
@@ -10,8 +9,8 @@
  * are faster to access again.
  */
 
-#ifndef mozilla_SplayTree_h_
+#ifndef mozilla_SplayTree_h
-#define mozilla_SplayTree_h_
+#define mozilla_SplayTree_h
 
 #include "mozilla/Assertions.h"
 #include "mozilla/NullPtr.h"
@@ -282,4 +281,4 @@ class SplayTree
 
 }  /* namespace mozilla */
 
-#endif /* mozilla_SplayTree_h_ */
+#endif /* mozilla_SplayTree_h */

mfbt/StandardInteger.h

@@ -1,12 +1,13 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=8 sts=2 et sw=2 tw=80: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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/. */
 
 /* Implements the C99 <stdint.h> interface for C and C++ code. */
 
-#ifndef mozilla_StandardInteger_h_
+#ifndef mozilla_StandardInteger_h
-#define mozilla_StandardInteger_h_
+#define mozilla_StandardInteger_h
 
 /*
  * The C99 standard header <stdint.h> exposes typedefs for common fixed-width
@@ -40,4 +41,4 @@
 #  include <stdint.h>
 #endif
 
-#endif  /* mozilla_StandardInteger_h_ */
+#endif /* mozilla_StandardInteger_h */

mfbt/TemplateLib.h

@@ -1,6 +1,6 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
- * vim: set ts=8 sts=4 et sw=4 tw=99:
+/* vim: set ts=8 sts=2 et sw=2 tw=80: */
- * This Source Code Form is subject to the terms of the Mozilla Public
+/* This Source Code Form is subject to the terms of the Mozilla Public
  * 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/. */
 
@@ -108,4 +108,4 @@ template<> struct MulOverflowMask<1> { static const size_t value = 0; };
 
 } // namespace mozilla
 
-#endif  /* mozilla_TemplateLib_h */
+#endif /* mozilla_TemplateLib_h */

mfbt/ThreadLocal.h

@@ -1,12 +1,13 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=8 sts=2 et sw=2 tw=80: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* Cross-platform lightweight thread local data wrappers. */
 
-#ifndef mozilla_ThreadLocal_h_
+#ifndef mozilla_ThreadLocal_h
-#define mozilla_ThreadLocal_h_
+#define mozilla_ThreadLocal_h
 
 #if defined(XP_WIN)
 // This file will get included in any file that wants to add a profiler mark.
@@ -144,4 +145,4 @@ ThreadLocal<T>::set(const T value)
 
 } // namespace mozilla
 
-#endif // mozilla_ThreadLocal_h_
+#endif /* mozilla_ThreadLocal_h */

mfbt/TypeTraits.h

@@ -1,12 +1,13 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=8 sts=2 et sw=2 tw=80: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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/. */
 
 /* Template-based metaprogramming and type-testing facilities. */
 
-#ifndef mozilla_TypeTraits_h_
+#ifndef mozilla_TypeTraits_h
-#define mozilla_TypeTraits_h_
+#define mozilla_TypeTraits_h
 
 /*
  * These traits are approximate copies of the traits and semantics from C++11's
@@ -665,4 +666,4 @@ struct Conditional<false, A, B>
 
 } /* namespace mozilla */
 
-#endif  /* mozilla_TypeTraits_h_ */
+#endif /* mozilla_TypeTraits_h */

mfbt/TypedEnum.h

@@ -1,12 +1,13 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=8 sts=2 et sw=2 tw=80: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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/. */
 
 /* Macros to emulate C++11 typed enums and enum classes. */
 
-#ifndef mozilla_TypedEnum_h_
+#ifndef mozilla_TypedEnum_h
-#define mozilla_TypedEnum_h_
+#define mozilla_TypedEnum_h
 
 #include "mozilla/Attributes.h"
 
@@ -210,4 +211,4 @@
 
 #endif /* __cplusplus */
 
-#endif  /* mozilla_TypedEnum_h_ */
+#endif /* mozilla_TypedEnum_h */

mfbt/Types.h

@@ -1,12 +1,13 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=8 sts=2 et sw=2 tw=80: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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/. */
 
 /* mfbt foundational types and macros. */
 
-#ifndef mozilla_Types_h_
+#ifndef mozilla_Types_h
-#define mozilla_Types_h_
+#define mozilla_Types_h
 
 /*
  * This header must be valid C and C++, includable by code embedding either
@@ -141,4 +142,4 @@
 #  define decltype __typeof__
 #endif
 
-#endif  /* mozilla_Types_h_ */
+#endif /* mozilla_Types_h */

mfbt/Util.h

@@ -1,4 +1,5 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=8 sts=2 et sw=2 tw=80: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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/. */
@@ -8,8 +9,8 @@
  * new headers, or to other appropriate existing headers, not here.
  */
 
-#ifndef mozilla_Util_h_
+#ifndef mozilla_Util_h
-#define mozilla_Util_h_
+#define mozilla_Util_h
 
 #include "mozilla/Assertions.h"
 #include "mozilla/Attributes.h"
@@ -332,4 +333,4 @@ ArrayEnd(T (&arr)[N])
 #  define MOZ_ARRAY_LENGTH(array)   (sizeof(array)/sizeof((array)[0]))
 #endif
 
-#endif  /* mozilla_Util_h_ */
+#endif /* mozilla_Util_h */

mfbt/Vector.h

@@ -1,6 +1,6 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
- * vim: set ts=8 sts=2 et sw=2 tw=80:
+/* vim: set ts=8 sts=2 et sw=2 tw=80: */
- * This Source Code Form is subject to the terms of the Mozilla Public
+/* This Source Code Form is subject to the terms of the Mozilla Public
  * 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/. */
 

mfbt/WeakPtr.h

@@ -1,7 +1,8 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=8 sts=2 et sw=2 tw=80: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* Weak pointer functionality, implemented as a mixin for use with any class. */
 
@@ -58,8 +59,8 @@
  * http://src.chromium.org/svn/trunk/src/base/memory/weak_ptr.h
  */
 
-#ifndef mozilla_WeakPtr_h_
+#ifndef mozilla_WeakPtr_h
-#define mozilla_WeakPtr_h_
+#define mozilla_WeakPtr_h
 
 #include "mozilla/Assertions.h"
 #include "mozilla/Atomics.h"
@@ -187,4 +188,4 @@ class WeakPtr : public WeakPtrBase<T, detail::WeakReference<T, detail::WeakRefer
 
 } // namespace mozilla
 
-#endif /* ifdef mozilla_WeakPtr_h_ */
+#endif /* mozilla_WeakPtr_h */