Bug 883697 (part 4b) - Make include guards consistent in js/src/yarr/. r=njn.
authorEmanuel Hoogeveen <emanuel.hoogeveen@gmail.com>
Wed, 19 Jun 2013 18:06:22 -0700
changeset 147294 4bce31cdb901d261089c5118e1fce423939d2401
parent 147293 fa4e688f5daa7998893c3aeaa34ea28a75f23e7f
child 147295 618c1cf5a2363fdd81b0069559ef93dd9527975c
push id2697
push userbbajaj@mozilla.com
push dateMon, 05 Aug 2013 18:49:53 +0000
treeherdermozilla-beta@dfec938c7b63 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnjn
bugs883697
milestone24.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 883697 (part 4b) - Make include guards consistent in js/src/yarr/. r=njn.
js/src/yarr/ASCIICType.h
js/src/yarr/BumpPointerAllocator.h
js/src/yarr/CheckedArithmetic.h
js/src/yarr/MatchResult.h
js/src/yarr/OSAllocator.h
js/src/yarr/PageAllocation.h
js/src/yarr/PageBlock.h
js/src/yarr/RegExpJitTables.h
js/src/yarr/VMTags.h
js/src/yarr/Yarr.h
js/src/yarr/YarrCanonicalizeUCS2.h
js/src/yarr/YarrInterpreter.h
js/src/yarr/YarrJIT.h
js/src/yarr/YarrParser.h
js/src/yarr/YarrPattern.h
js/src/yarr/YarrSyntaxChecker.h
js/src/yarr/wtfbridge.h
--- a/js/src/yarr/ASCIICType.h
+++ b/js/src/yarr/ASCIICType.h
@@ -25,18 +25,18 @@
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * ***** END LICENSE BLOCK ***** */
 
-#ifndef WTF_ASCIICType_h
-#define WTF_ASCIICType_h
+#ifndef yarr_ASCIICType_h
+#define yarr_ASCIICType_h
 
 #include "assembler/wtf/Assertions.h"
 
 // The behavior of many of the functions in the <ctype.h> header is dependent
 // on the current locale. But in the WebKit project, all uses of those functions
 // are in code processing something that's not locale-specific. These equivalents
 // for some of the <ctype.h> functions are named more explicitly, not dependent
 // on the C library locale, and we should also optimize them as needed.
@@ -175,9 +175,9 @@ using WTF::isASCIILower;
 using WTF::isASCIIOctalDigit;
 using WTF::isASCIIPrintable;
 using WTF::isASCIISpace;
 using WTF::isASCIIUpper;
 using WTF::toASCIIHexValue;
 using WTF::toASCIILower;
 using WTF::toASCIIUpper;
 
-#endif
+#endif /* yarr_ASCIICType_h */
--- a/js/src/yarr/BumpPointerAllocator.h
+++ b/js/src/yarr/BumpPointerAllocator.h
@@ -22,18 +22,18 @@
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  *
  * ***** END LICENSE BLOCK ***** */
 
-#ifndef BumpPointerAllocator_h
-#define BumpPointerAllocator_h
+#ifndef yarr_BumpPointerAllocator_h
+#define yarr_BumpPointerAllocator_h
 
 #include "PageAllocation.h"
 
 namespace WTF {
 
 #if WTF_CPU_SPARC
 #define MINIMUM_BUMP_POOL_SIZE 0x2000
 #elif WTF_CPU_IA64
@@ -269,9 +269,9 @@ public:
 private:
     BumpPointerPool* m_head;
 };
 
 }
 
 using WTF::BumpPointerAllocator;
 
-#endif // BumpPointerAllocator_h
+#endif /* yarr_BumpPointerAllocator_h */
--- a/js/src/yarr/CheckedArithmetic.h
+++ b/js/src/yarr/CheckedArithmetic.h
@@ -20,18 +20,18 @@
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#ifndef CheckedArithmetic_h
-#define CheckedArithmetic_h
+#ifndef yarr_CheckedArithmetic_h
+#define yarr_CheckedArithmetic_h
 
 #include "assembler/wtf/Assertions.h"
 
 #include <limits>
 #include "mozilla/StandardInteger.h"
 #include "mozilla/TypeTraits.h"
 
 #ifdef _MSC_VER
@@ -707,9 +707,9 @@ template <typename U, typename V, typena
     return Checked<U, OverflowHandler>(lhs) * rhs;
 }
 
 }
 
 using WTF::Checked;
 using WTF::RecordOverflow;
 
-#endif
+#endif /* yarr_CheckedArithmetic_h */
--- a/js/src/yarr/MatchResult.h
+++ b/js/src/yarr/MatchResult.h
@@ -20,18 +20,18 @@
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#ifndef MatchResult_h
-#define MatchResult_h
+#ifndef yarr_MatchResult_h
+#define yarr_MatchResult_h
 
 #include "wtfbridge.h"
 
 typedef uint64_t EncodedMatchResult;
 
 struct MatchResult {
     MatchResult(int start, int end)
         : start(start)
@@ -70,9 +70,9 @@ struct MatchResult {
         return start == end;
     }
 
     // strings are limited to a length of 2^28. So this is safe
     int start;
     int end;
 };
 
-#endif
+#endif /* yarr_MatchResult_h */
--- a/js/src/yarr/OSAllocator.h
+++ b/js/src/yarr/OSAllocator.h
@@ -22,18 +22,18 @@
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * ***** END LICENSE BLOCK ***** */
 
-#ifndef OSAllocator_h
-#define OSAllocator_h
+#ifndef yarr_OSAllocator_h
+#define yarr_OSAllocator_h
 
 #include <stdlib.h>
 #include "wtfbridge.h"
 #include "assembler/wtf/VMTags.h"
 #include "assembler/wtf/Assertions.h"
 
 namespace WTF {
 
@@ -95,9 +95,9 @@ inline void OSAllocator::decommitAndRele
 {
     decommitAndRelease(base, size, base, size);
 }
 
 } // namespace WTF
 
 using WTF::OSAllocator;
 
-#endif // OSAllocator_h
+#endif /* yarr_OSAllocator_h */
--- a/js/src/yarr/PageAllocation.h
+++ b/js/src/yarr/PageAllocation.h
@@ -22,18 +22,18 @@
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  *
  * ***** END LICENSE BLOCK ***** */
 
-#ifndef PageAllocation_h
-#define PageAllocation_h
+#ifndef yarr_PageAllocation_h
+#define yarr_PageAllocation_h
 
 #include "wtfbridge.h"
 #include "OSAllocator.h"
 #include "PageBlock.h"
 #include "assembler/wtf/VMTags.h"
 
 #if WTF_OS_DARWIN
 #include <mach/mach_init.h>
@@ -123,9 +123,9 @@ private:
     {
     }
 };
 
 } // namespace WTF
 
 using WTF::PageAllocation;
 
-#endif // PageAllocation_h
+#endif /* yarr_PageAllocation_h */
--- a/js/src/yarr/PageBlock.h
+++ b/js/src/yarr/PageBlock.h
@@ -22,18 +22,18 @@
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * ***** END LICENSE BLOCK ***** */
 
-#ifndef PageBlock_h
-#define PageBlock_h
+#ifndef yarr_PageBlock_h
+#define yarr_PageBlock_h
 
 #include "mozilla/StandardInteger.h"
 
 #include <stddef.h>
 
 namespace WTF {
 
 size_t pageSize();
@@ -83,9 +83,9 @@ inline PageBlock::PageBlock(void* base, 
 
 } // namespace WTF
 
 using WTF::pageSize;
 using WTF::isPageAligned;
 using WTF::isPageAligned;
 using WTF::isPowerOfTwo;
 
-#endif // PageBlock_h
+#endif /* yarr_PageBlock_h */
--- a/js/src/yarr/RegExpJitTables.h
+++ b/js/src/yarr/RegExpJitTables.h
@@ -1,8 +1,11 @@
+#ifndef yarr_RegExpJitTables_h
+#define yarr_RegExpJitTables_h
+
 static const char _spacesData[65536] = {
 0,0,0,0,0,0,0,0,0,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -2712,9 +2715,9 @@ CharacterClass* wordcharCreate()
     CharacterClass* characterClass = js_new<CharacterClass>(CharacterClassTable::create(_wordcharData, false));
     characterClass->m_ranges.append(CharacterRange(0x30, 0x39));
     characterClass->m_ranges.append(CharacterRange(0x41, 0x5a));
     characterClass->m_matches.append(0x5f);
     characterClass->m_ranges.append(CharacterRange(0x61, 0x7a));
     return characterClass;
 }
 
-
+#endif /* yarr_RegExpJitTables_h */
--- a/js/src/yarr/VMTags.h
+++ b/js/src/yarr/VMTags.h
@@ -20,18 +20,18 @@
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#ifndef VMTags_h
-#define VMTags_h
+#ifndef yarr_VMTags_h
+#define yarr_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. 
 #if WTF_OS_DARWIN
 
 #include <mach/vm_statistics.h>
 
 #if !defined(TARGETING_TIGER)
@@ -84,9 +84,9 @@
 #define VM_TAG_FOR_TCMALLOC_MEMORY -1
 #define VM_TAG_FOR_COLLECTOR_MEMORY -1
 #define VM_TAG_FOR_EXECUTABLEALLOCATOR_MEMORY -1
 #define VM_TAG_FOR_REGISTERFILE_MEMORY -1
 #define VM_TAG_FOR_WEBCORE_PURGEABLE_MEMORY -1
 
 #endif // OS(DARWIN)
 
-#endif // VMTags_h
+#endif /* yarr_VMTags_h */
--- a/js/src/yarr/Yarr.h
+++ b/js/src/yarr/Yarr.h
@@ -22,18 +22,18 @@
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef Yarr_h
-#define Yarr_h
+#ifndef yarr_Yarr_h
+#define yarr_Yarr_h
 
 #include <limits.h>
 #include "YarrInterpreter.h"
 #include "YarrPattern.h"
 
 namespace JSC { namespace Yarr {
 
 #define YarrStackSpaceForBackTrackInfoPatternCharacter 1 // Only for !fixed quantifiers.
@@ -63,10 +63,9 @@ enum JSRegExpResult {
 
 enum YarrCharSize {
     Char8,
     Char16
 };
 
 } } // namespace JSC::Yarr
 
-#endif // Yarr_h
-
+#endif /* yarr_Yarr_h */
--- a/js/src/yarr/YarrCanonicalizeUCS2.h
+++ b/js/src/yarr/YarrCanonicalizeUCS2.h
@@ -20,18 +20,18 @@
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#ifndef YarrCanonicalizeUCS2_H
-#define YarrCanonicalizeUCS2_H
+#ifndef yarr_YarrCanonicalizeUCS2_h
+#define yarr_YarrCanonicalizeUCS2_h
 
 #include "mozilla/StandardInteger.h"
 
 #include "wtfbridge.h"
 
 namespace JSC { namespace Yarr {
 
 // This set of data (autogenerated using YarrCanonicalizeUCS2.js into YarrCanonicalizeUCS2.cpp)
@@ -133,9 +133,9 @@ inline bool areCanonicallyEquivalent(UCh
     }
 
     ASSERT_NOT_REACHED();
     return false;
 }
 
 } } // JSC::Yarr
 
-#endif
+#endif /* yarr_YarrCanonicalizeUCS2_h */
--- a/js/src/yarr/YarrInterpreter.h
+++ b/js/src/yarr/YarrInterpreter.h
@@ -20,18 +20,18 @@
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#ifndef YarrInterpreter_h
-#define YarrInterpreter_h
+#ifndef yarr_YarrInterpreter_h
+#define yarr_YarrInterpreter_h
 
 #include "jscntxt.h"
 
 #include "yarr/YarrPattern.h"
 
 namespace WTF {
 class BumpPointerAllocator;
 }
@@ -389,9 +389,9 @@ private:
 
 JS_EXPORT_PRIVATE PassOwnPtr<BytecodePattern> byteCompile(YarrPattern&, BumpPointerAllocator*);
 JS_EXPORT_PRIVATE unsigned interpret(JSContext *cx, BytecodePattern*, const String& input, unsigned start, unsigned* output);
 unsigned interpret(JSContext *cx, BytecodePattern*, const LChar* input, unsigned length, unsigned start, unsigned* output);
 unsigned interpret(JSContext *cx, BytecodePattern*, const UChar* input, unsigned length, unsigned start, unsigned* output);
 
 } } // namespace JSC::Yarr
 
-#endif // YarrInterpreter_h
+#endif /* yarr_YarrInterpreter_h */
--- a/js/src/yarr/YarrJIT.h
+++ b/js/src/yarr/YarrJIT.h
@@ -20,18 +20,18 @@
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#ifndef YarrJIT_h
-#define YarrJIT_h
+#ifndef yarr_YarrJIT_h
+#define yarr_YarrJIT_h
 
 #include "assembler/wtf/Platform.h"
 
 #if ENABLE_YARR_JIT
 
 #include "assembler/assembler/MacroAssembler.h"
 
 #include "MatchResult.h"
@@ -191,9 +191,9 @@ enum YarrJITCompileMode {
     IncludeSubpatterns
 };
 void jitCompile(YarrPattern&, YarrCharSize, JSGlobalData*, YarrCodeBlock& jitObject, YarrJITCompileMode = IncludeSubpatterns);
 
 } } // namespace JSC::Yarr
 
 #endif
 
-#endif // YarrJIT_h
+#endif /* yarr_YarrJIT_h */
--- a/js/src/yarr/YarrParser.h
+++ b/js/src/yarr/YarrParser.h
@@ -20,18 +20,18 @@
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#ifndef YarrParser_h
-#define YarrParser_h
+#ifndef yarr_YarrParser_h
+#define yarr_YarrParser_h
 
 #include "Yarr.h"
 
 namespace JSC { namespace Yarr {
 
 enum BuiltInCharacterClassID {
     DigitClassID,
     SpaceClassID,
@@ -841,9 +841,9 @@ ErrorCode parse(Delegate& delegate, cons
     if (pattern.is8Bit())
         return Parser<Delegate, LChar>(delegate, pattern, backReferenceLimit).parse();
 #endif
     return Parser<Delegate, UChar>(delegate, pattern, backReferenceLimit).parse();
 }
 
 } } // namespace JSC::Yarr
 
-#endif // YarrParser_h
+#endif /* yarr_YarrParser_h */
--- a/js/src/yarr/YarrPattern.h
+++ b/js/src/yarr/YarrPattern.h
@@ -21,18 +21,18 @@
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#ifndef YarrPattern_h
-#define YarrPattern_h
+#ifndef yarr_YarrPattern_h
+#define yarr_YarrPattern_h
 
 #include "wtfbridge.h"
 #include "ASCIICType.h"
 
 namespace JSC { namespace Yarr {
 
 struct PatternDisjunction;
 
@@ -466,9 +466,9 @@ private:
     CharacterClass* wordcharCached;
     CharacterClass* nondigitsCached;
     CharacterClass* nonspacesCached;
     CharacterClass* nonwordcharCached;
 };
 
 } } // namespace JSC::Yarr
 
-#endif // YarrPattern_h
+#endif /* yarr_YarrPattern_h */
--- a/js/src/yarr/YarrSyntaxChecker.h
+++ b/js/src/yarr/YarrSyntaxChecker.h
@@ -20,22 +20,21 @@
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#ifndef YarrSyntaxChecker_h
-#define YarrSyntaxChecker_h
+#ifndef yarr_YarrSyntaxChecker_h
+#define yarr_YarrSyntaxChecker_h
 
 #include "wtfbridge.h"
 #include "YarrParser.h"
 
 namespace JSC { namespace Yarr {
 
 ErrorCode checkSyntax(const String& pattern);
 
 }} // JSC::YARR
 
-#endif // YarrSyntaxChecker_h
-
+#endif /* yarr_YarrSyntaxChecker_h */
--- a/js/src/yarr/wtfbridge.h
+++ b/js/src/yarr/wtfbridge.h
@@ -1,16 +1,16 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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 jswtfbridge_h__
-#define jswtfbridge_h__
+#ifndef yarr_wtfbridge_h
+#define yarr_wtfbridge_h
 
 /*
  * WTF compatibility layer. This file provides various type and data
  * definitions for use by Yarr.
  */
 
 #include <stdio.h>
 #include <stdarg.h>
@@ -329,9 +329,9 @@ namespace WTF {
  * Sentinel value used in Yarr.
  */
 const size_t notFound = size_t(-1);
 
 }
 
 #define JS_EXPORT_PRIVATE
 
-#endif
+#endif /* yarr_wtfbridge_h */