Bug 1075093 - Build error in txStylesheet.cpp when enabling PR_LOGGING in non-debug builds. r=froydnj
authorEric Rahm <erahm@mozilla.com>
Tue, 30 Sep 2014 15:11:22 -0700
changeset 208065 e3b4b545dace5618b59b9925a1d1d9e0b35bad85
parent 208064 b87e4ed4ffc6b6845fa52a0e73009c8f0fc16cb6
child 208066 1b80c2b2672259df7a9c15c0ffe0db909b151175
push id27575
push usercbook@mozilla.com
push dateWed, 01 Oct 2014 12:52:17 +0000
treeherdermozilla-central@fe0afc101ad2 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfroydnj
bugs1075093
milestone35.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 1075093 - Build error in txStylesheet.cpp when enabling PR_LOGGING in non-debug builds. r=froydnj
dom/xslt/xslt/txStylesheet.cpp
--- a/dom/xslt/xslt/txStylesheet.cpp
+++ b/dom/xslt/xslt/txStylesheet.cpp
@@ -123,17 +123,17 @@ txStylesheet::findTemplate(const txXPath
     if (aImportedBy) {
         ImportFrame* curr = static_cast<ImportFrame*>(frameIter.next());
         while (curr != aImportedBy) {
                curr = static_cast<ImportFrame*>(frameIter.next());
         }
         endFrame = aImportedBy->mFirstNotImported;
     }
 
-#ifdef PR_LOGGING
+#if defined(PR_LOGGING) && defined(TX_TO_STRING)
     txPattern* match = 0;
 #endif
 
     ImportFrame* frame;
     while (!matchTemplate &&
            (frame = static_cast<ImportFrame*>(frameIter.next())) &&
            frame != endFrame) {
 
@@ -144,17 +144,17 @@ txStylesheet::findTemplate(const txXPath
         if (templates) {
             // Find template with highest priority
             uint32_t i, len = templates->Length();
             for (i = 0; i < len && !matchTemplate; ++i) {
                 MatchableTemplate& templ = (*templates)[i];
                 if (templ.mMatch->matches(aNode, aContext)) {
                     matchTemplate = templ.mFirstInstruction;
                     *aImportFrame = frame;
-#ifdef PR_LOGGING
+#if defined(PR_LOGGING) && defined(TX_TO_STRING)
                     match = templ.mMatch;
 #endif
                 }
             }
         }
     }
 
 #ifdef PR_LOGGING