From a5da610b878033f2a0719389cbe23b3894307888 Mon Sep 17 00:00:00 2001
From: Moonchild <moonchild@palemoon.org>
Date: Mon, 18 May 2020 06:00:43 +0000
Subject: Issue #80 - De-unify netwerk/protocol/ftp

---
 netwerk/protocol/ftp/moz.build        | 2 +-
 netwerk/protocol/ftp/nsFTPChannel.cpp | 3 +++
 netwerk/protocol/ftp/nsFTPChannel.h   | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/netwerk/protocol/ftp/moz.build b/netwerk/protocol/ftp/moz.build
index 060fb7575..f132dfdd3 100644
--- a/netwerk/protocol/ftp/moz.build
+++ b/netwerk/protocol/ftp/moz.build
@@ -20,7 +20,7 @@ EXPORTS.mozilla.net += [
     'FTPChannelParent.h',
 ]
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'FTPChannelChild.cpp',
     'FTPChannelParent.cpp',
     'nsFTPChannel.cpp',
diff --git a/netwerk/protocol/ftp/nsFTPChannel.cpp b/netwerk/protocol/ftp/nsFTPChannel.cpp
index 2a0f04915..5c5bee920 100644
--- a/netwerk/protocol/ftp/nsFTPChannel.cpp
+++ b/netwerk/protocol/ftp/nsFTPChannel.cpp
@@ -14,6 +14,9 @@ using namespace mozilla;
 using namespace mozilla::net;
 extern LazyLogModule gFTPLog;
 
+#undef LOG
+#define LOG(args) MOZ_LOG(gFTPLog, mozilla::LogLevel::Debug, args)
+
 // There are two transport connections established for an 
 // ftp connection. One is used for the command channel , and
 // the other for the data channel. The command channel is the first
diff --git a/netwerk/protocol/ftp/nsFTPChannel.h b/netwerk/protocol/ftp/nsFTPChannel.h
index 549e577b3..f829c5f59 100644
--- a/netwerk/protocol/ftp/nsFTPChannel.h
+++ b/netwerk/protocol/ftp/nsFTPChannel.h
@@ -18,6 +18,7 @@
 #include "nsIProxyInfo.h"
 #include "nsIProxiedChannel.h"
 #include "nsIResumableChannel.h"
+#include "ADivertableParentChannel.h"
 
 class nsIURI;
 using mozilla::net::ADivertableParentChannel;
-- 
cgit v1.2.3