From 6cdd6c62867b53c0042aaf71fb6258782fba4c7a Mon Sep 17 00:00:00 2001
From: Moonchild <moonchild@palemoon.org>
Date: Mon, 18 May 2020 12:13:22 +0000
Subject: Issue #80 - De-unify netwerk/streamconv

---
 netwerk/streamconv/converters/moz.build              | 6 +++---
 netwerk/streamconv/converters/nsHTTPCompressConv.cpp | 2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'netwerk')

diff --git a/netwerk/streamconv/converters/moz.build b/netwerk/streamconv/converters/moz.build
index 10354357b..4c0d177c5 100644
--- a/netwerk/streamconv/converters/moz.build
+++ b/netwerk/streamconv/converters/moz.build
@@ -10,7 +10,7 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'necko_http'
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'mozTXTToHTMLConv.cpp',
     'nsDirIndex.cpp',
     'nsDirIndexParser.cpp',
@@ -22,13 +22,13 @@ UNIFIED_SOURCES += [
 ]
 
 if 'ftp' in CONFIG['NECKO_PROTOCOLS']:
-    UNIFIED_SOURCES += [
+    SOURCES += [
         'nsFTPDirListingConv.cpp',
         'ParseFTPList.cpp',
     ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'cocoa':
-    UNIFIED_SOURCES += [
+    SOURCES += [
         'nsBinHexDecoder.cpp',
     ]
 
diff --git a/netwerk/streamconv/converters/nsHTTPCompressConv.cpp b/netwerk/streamconv/converters/nsHTTPCompressConv.cpp
index c35b0dcac..2821c9aed 100644
--- a/netwerk/streamconv/converters/nsHTTPCompressConv.cpp
+++ b/netwerk/streamconv/converters/nsHTTPCompressConv.cpp
@@ -15,8 +15,10 @@
 #include "nsThreadUtils.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/Logging.h"
+#include "mozilla/UniquePtrExtensions.h"
 #include "nsIForcePendingChannel.h"
 #include "nsIRequest.h"
+#include <inttypes.h>
 
 // brotli headers
 #include "state.h"
-- 
cgit v1.2.3