summaryrefslogtreecommitdiffstats
path: root/dom/archivereader
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@wolfbeast.com>2020-04-26 12:56:46 +0200
committerwolfbeast <mcwerewolf@wolfbeast.com>2020-04-26 12:56:46 +0200
commit98fe8b0ccbea37c2681ad8c788baa91554871f4d (patch)
tree0e269a27661fea619ab07a533e0c1fa195c3c671 /dom/archivereader
parente08a4ad1c8096fc8de64fac4f36cf0c569cb4420 (diff)
parent519030e688dd7075a7cd9f14dd6fb9e210b5a689 (diff)
downloadUXP-RELBASE_20200426.tar
UXP-RELBASE_20200426.tar.gz
UXP-RELBASE_20200426.tar.lz
UXP-RELBASE_20200426.tar.xz
UXP-RELBASE_20200426.zip
Merge branch 'redwood' into 28.9-platformRELBASE_20200426
Diffstat (limited to 'dom/archivereader')
-rw-r--r--dom/archivereader/ArchiveRequest.cpp2
-rw-r--r--dom/archivereader/ArchiveZipFile.cpp1
-rw-r--r--dom/archivereader/moz.build2
3 files changed, 4 insertions, 1 deletions
diff --git a/dom/archivereader/ArchiveRequest.cpp b/dom/archivereader/ArchiveRequest.cpp
index ec1686804..8505f0e1f 100644
--- a/dom/archivereader/ArchiveRequest.cpp
+++ b/dom/archivereader/ArchiveRequest.cpp
@@ -8,10 +8,12 @@
#include "mozilla/EventDispatcher.h"
#include "mozilla/dom/ArchiveRequestBinding.h"
+#include "mozilla/dom/File.h"
#include "mozilla/dom/ScriptSettings.h"
#include "nsContentUtils.h"
using namespace mozilla;
+using namespace mozilla::dom;
USING_ARCHIVEREADER_NAMESPACE
diff --git a/dom/archivereader/ArchiveZipFile.cpp b/dom/archivereader/ArchiveZipFile.cpp
index d374fe91f..e1716f348 100644
--- a/dom/archivereader/ArchiveZipFile.cpp
+++ b/dom/archivereader/ArchiveZipFile.cpp
@@ -12,6 +12,7 @@
#include "mozilla/Attributes.h"
#include "mozilla/dom/File.h"
+using namespace mozilla;
using namespace mozilla::dom;
USING_ARCHIVEREADER_NAMESPACE
diff --git a/dom/archivereader/moz.build b/dom/archivereader/moz.build
index 57dbfa121..a5d853c91 100644
--- a/dom/archivereader/moz.build
+++ b/dom/archivereader/moz.build
@@ -13,7 +13,7 @@ EXPORTS.mozilla.dom.archivereader += [
'ArchiveZipFile.h',
]
-UNIFIED_SOURCES += [
+SOURCES += [
'ArchiveEvent.cpp',
'ArchiveReader.cpp',
'ArchiveRequest.cpp',