diff options
| author | Moonchild <moonchild@palemoon.org> | 2020-06-01 21:58:35 +0000 |
|---|---|---|
| committer | Moonchild <moonchild@palemoon.org> | 2020-06-01 21:58:35 +0000 |
| commit | c6ca4380e9e5e95df9de02daf8bfb9a6ebc22810 (patch) | |
| tree | c7672903a2030d37f861b12900165a015f49d10a /netwerk/protocol/data | |
| parent | 451509e2c0188a4164d4b3d1d9f5839ed1e95246 (diff) | |
| parent | 744b044935f7d1d67fbe0df42d898efcbdd00536 (diff) | |
| download | UXP-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/data')
| -rw-r--r-- | netwerk/protocol/data/moz.build | 2 | ||||
| -rw-r--r-- | netwerk/protocol/data/nsDataChannel.cpp | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/netwerk/protocol/data/moz.build b/netwerk/protocol/data/moz.build index 0958118fa..2c45b8067 100644 --- a/netwerk/protocol/data/moz.build +++ b/netwerk/protocol/data/moz.build @@ -8,7 +8,7 @@ EXPORTS.mozilla.net += [ 'DataChannelParent.h', ] -UNIFIED_SOURCES += [ +SOURCES += [ 'DataChannelChild.cpp', 'DataChannelParent.cpp', 'nsDataChannel.cpp', diff --git a/netwerk/protocol/data/nsDataChannel.cpp b/netwerk/protocol/data/nsDataChannel.cpp index 608a6c6e0..148a7901a 100644 --- a/netwerk/protocol/data/nsDataChannel.cpp +++ b/netwerk/protocol/data/nsDataChannel.cpp @@ -16,6 +16,7 @@ #include "nsEscape.h" using namespace mozilla; +using namespace mozilla::net; nsresult nsDataChannel::OpenContentStream(bool async, nsIInputStream **result, |