From b36f465a9de7ccc08a7829b783051ee5a5997182 Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Mon, 11 Nov 2013 09:07:50 -0500
Subject: [PATCH] Bug 936927 - Build the HTML parser in unified mode;
 r=hsivonen

---
 parser/html/moz.build                | 2 +-
 parser/html/nsHtml5TreeOperation.cpp | 2 +-
 parser/htmlparser/src/moz.build      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/parser/html/moz.build b/parser/html/moz.build
index babd8180db0..c903a68a5c3 100644
--- a/parser/html/moz.build
+++ b/parser/html/moz.build
@@ -47,7 +47,7 @@ EXPORTS += [
     'nsParserUtils.h',
 ]
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'nsHtml5Atom.cpp',
     'nsHtml5Atoms.cpp',
     'nsHtml5AtomTable.cpp',
diff --git a/parser/html/nsHtml5TreeOperation.cpp b/parser/html/nsHtml5TreeOperation.cpp
index a3f351ae969..b179d0d903b 100644
--- a/parser/html/nsHtml5TreeOperation.cpp
+++ b/parser/html/nsHtml5TreeOperation.cpp
@@ -42,7 +42,7 @@
 #include "mozilla/Likely.h"
 #include "nsTextNode.h"
 
-namespace dom = mozilla::dom;
+using namespace mozilla;
 
 static NS_DEFINE_CID(kFormProcessorCID, NS_FORMPROCESSOR_CID);
 
diff --git a/parser/htmlparser/src/moz.build b/parser/htmlparser/src/moz.build
index 6e2674ceb95..0c4186c00f3 100644
--- a/parser/htmlparser/src/moz.build
+++ b/parser/htmlparser/src/moz.build
@@ -6,7 +6,7 @@
 
 MODULE = 'htmlparser'
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'CNavDTD.cpp',
     'CParserContext.cpp',
     'nsElementTable.cpp',