summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--dom/xul/moz.build4
-rw-r--r--dom/xul/nsXULContentSink.cpp2
-rw-r--r--dom/xul/templates/moz.build2
-rw-r--r--dom/xul/templates/nsInstantiationNode.cpp3
-rw-r--r--dom/xul/templates/nsTemplateMap.h2
-rw-r--r--dom/xul/templates/nsXULTemplateQueryProcessorRDF.cpp4
-rw-r--r--dom/xul/templates/nsXULTemplateQueryProcessorStorage.cpp2
-rw-r--r--dom/xul/templates/nsXULTreeBuilder.cpp3
8 files changed, 19 insertions, 3 deletions
diff --git a/dom/xul/moz.build b/dom/xul/moz.build
index 8dff722be..dad38a2c4 100644
--- a/dom/xul/moz.build
+++ b/dom/xul/moz.build
@@ -19,7 +19,7 @@ if CONFIG['MOZ_XUL']:
'nsIXULDocument.h',
]
- UNIFIED_SOURCES += [
+ SOURCES += [
'nsXULCommandDispatcher.cpp',
'nsXULContentSink.cpp',
'nsXULElement.cpp',
@@ -36,7 +36,7 @@ XPIDL_SOURCES += [
XPIDL_MODULE = 'xul'
-UNIFIED_SOURCES += [
+SOURCES += [
'nsXULControllers.cpp',
]
diff --git a/dom/xul/nsXULContentSink.cpp b/dom/xul/nsXULContentSink.cpp
index 7103be758..edeee8728 100644
--- a/dom/xul/nsXULContentSink.cpp
+++ b/dom/xul/nsXULContentSink.cpp
@@ -42,6 +42,7 @@
#include "nsReadableUtils.h"
#include "nsXULElement.h"
#include "mozilla/Logging.h"
+#include "mozilla/CheckedInt.h"
#include "prmem.h"
#include "nsCRT.h"
@@ -57,6 +58,7 @@
#include "nsIScriptError.h"
#include "nsContentTypeParser.h"
+using namespace mozilla;
static mozilla::LazyLogModule gContentSinkLog("nsXULContentSink");;
//----------------------------------------------------------------------
diff --git a/dom/xul/templates/moz.build b/dom/xul/templates/moz.build
index 3beb0b7e5..780f01941 100644
--- a/dom/xul/templates/moz.build
+++ b/dom/xul/templates/moz.build
@@ -17,7 +17,7 @@ XPIDL_SOURCES += [
XPIDL_MODULE = 'xultmpl'
-UNIFIED_SOURCES += [
+SOURCES += [
'nsContentSupportMap.cpp',
'nsContentTestNode.cpp',
'nsInstantiationNode.cpp',
diff --git a/dom/xul/templates/nsInstantiationNode.cpp b/dom/xul/templates/nsInstantiationNode.cpp
index 9079d4189..ebf12acad 100644
--- a/dom/xul/templates/nsInstantiationNode.cpp
+++ b/dom/xul/templates/nsInstantiationNode.cpp
@@ -8,6 +8,9 @@
#include "nsXULTemplateQueryProcessorRDF.h"
#include "mozilla/Logging.h"
+
+using namespace mozilla;
+
extern mozilla::LazyLogModule gXULTemplateLog;
nsInstantiationNode::nsInstantiationNode(nsXULTemplateQueryProcessorRDF* aProcessor,
diff --git a/dom/xul/templates/nsTemplateMap.h b/dom/xul/templates/nsTemplateMap.h
index cb828b093..dfa7d611a 100644
--- a/dom/xul/templates/nsTemplateMap.h
+++ b/dom/xul/templates/nsTemplateMap.h
@@ -9,6 +9,8 @@
#include "PLDHashTable.h"
#include "nsXULElement.h"
+using mozilla::fallible;
+
class nsTemplateMap {
protected:
struct Entry : public PLDHashEntryHdr {
diff --git a/dom/xul/templates/nsXULTemplateQueryProcessorRDF.cpp b/dom/xul/templates/nsXULTemplateQueryProcessorRDF.cpp
index 732e545d0..ecf6b64c5 100644
--- a/dom/xul/templates/nsXULTemplateQueryProcessorRDF.cpp
+++ b/dom/xul/templates/nsXULTemplateQueryProcessorRDF.cpp
@@ -35,6 +35,10 @@
#include "nsXULSortService.h"
#include "nsIDocument.h"
+#include "mozilla/Logging.h"
+
+using namespace mozilla;
+
//----------------------------------------------------------------------
#define PARSE_TYPE_INTEGER "Integer"
diff --git a/dom/xul/templates/nsXULTemplateQueryProcessorStorage.cpp b/dom/xul/templates/nsXULTemplateQueryProcessorStorage.cpp
index a70307bf5..cd7c32eae 100644
--- a/dom/xul/templates/nsXULTemplateQueryProcessorStorage.cpp
+++ b/dom/xul/templates/nsXULTemplateQueryProcessorStorage.cpp
@@ -28,6 +28,8 @@
#include "nsIDocument.h"
#include "nsNetUtil.h"
+using mozilla::fallible;
+
//----------------------------------------------------------------------
//
// nsXULTemplateResultSetStorage
diff --git a/dom/xul/templates/nsXULTreeBuilder.cpp b/dom/xul/templates/nsXULTreeBuilder.cpp
index b42133484..3356700be 100644
--- a/dom/xul/templates/nsXULTreeBuilder.cpp
+++ b/dom/xul/templates/nsXULTreeBuilder.cpp
@@ -32,6 +32,9 @@
#include "nsTreeContentView.h"
#include "nsIXULStore.h"
#include "mozilla/BinarySearch.h"
+#include "mozilla/Logging.h"
+
+using mozilla::LogLevel;
// For security check
#include "nsIDocument.h"