summaryrefslogtreecommitdiffstats
path: root/netwerk/protocol/file
diff options
context:
space:
mode:
authorMoonchild <moonchild@palemoon.org>2020-06-01 21:58:35 +0000
committerMoonchild <moonchild@palemoon.org>2020-06-01 21:58:35 +0000
commitc6ca4380e9e5e95df9de02daf8bfb9a6ebc22810 (patch)
treec7672903a2030d37f861b12900165a015f49d10a /netwerk/protocol/file
parent451509e2c0188a4164d4b3d1d9f5839ed1e95246 (diff)
parent744b044935f7d1d67fbe0df42d898efcbdd00536 (diff)
downloadUXP-c6ca4380e9e5e95df9de02daf8bfb9a6ebc22810.tar
UXP-c6ca4380e9e5e95df9de02daf8bfb9a6ebc22810.tar.gz
UXP-c6ca4380e9e5e95df9de02daf8bfb9a6ebc22810.tar.lz
UXP-c6ca4380e9e5e95df9de02daf8bfb9a6ebc22810.tar.xz
UXP-c6ca4380e9e5e95df9de02daf8bfb9a6ebc22810.zip
Merge remote-tracking branch 'origin/redwood' into release
Diffstat (limited to 'netwerk/protocol/file')
-rw-r--r--netwerk/protocol/file/moz.build2
-rw-r--r--netwerk/protocol/file/nsFileProtocolHandler.cpp2
2 files changed, 3 insertions, 1 deletions
diff --git a/netwerk/protocol/file/moz.build b/netwerk/protocol/file/moz.build
index 223ff2f2b..c6be28ef2 100644
--- a/netwerk/protocol/file/moz.build
+++ b/netwerk/protocol/file/moz.build
@@ -15,7 +15,7 @@ XPIDL_SOURCES += [
XPIDL_MODULE = 'necko_file'
-UNIFIED_SOURCES += [
+SOURCES += [
'nsFileChannel.cpp',
'nsFileProtocolHandler.cpp',
]
diff --git a/netwerk/protocol/file/nsFileProtocolHandler.cpp b/netwerk/protocol/file/nsFileProtocolHandler.cpp
index e55cb9d47..3896dabad 100644
--- a/netwerk/protocol/file/nsFileProtocolHandler.cpp
+++ b/netwerk/protocol/file/nsFileProtocolHandler.cpp
@@ -28,6 +28,8 @@
#define DESKTOP_ENTRY_SECTION "Desktop Entry"
#endif
+using namespace mozilla::net;
+
//-----------------------------------------------------------------------------
nsFileProtocolHandler::nsFileProtocolHandler()