mozilla-libproxy.patch
author Wolfgang Rosenauer <wr@rosenauer.org>
Sat, 31 Oct 2015 20:58:31 +0100
changeset 885 ee3c462047d5
permissions -rw-r--r--
42 beta cycle
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
885
ee3c462047d5 42 beta cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     1
# HG changeset patch
ee3c462047d5 42 beta cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     2
# User Wolfgang Rosenauer <wr@rosenauer.org>
ee3c462047d5 42 beta cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     3
# Parent  95b421ca30846be2b5d7230d72263e6dff042d0b
ee3c462047d5 42 beta cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     4
Bug 1220399 - building with libproxy support fails
ee3c462047d5 42 beta cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     5
ee3c462047d5 42 beta cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     6
diff --git a/toolkit/system/unixproxy/nsLibProxySettings.cpp b/toolkit/system/unixproxy/nsLibProxySettings.cpp
ee3c462047d5 42 beta cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     7
--- a/toolkit/system/unixproxy/nsLibProxySettings.cpp
ee3c462047d5 42 beta cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     8
+++ b/toolkit/system/unixproxy/nsLibProxySettings.cpp
ee3c462047d5 42 beta cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     9
@@ -2,16 +2,17 @@
ee3c462047d5 42 beta cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    10
 /* This Source Code Form is subject to the terms of the Mozilla Public
ee3c462047d5 42 beta cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    11
  * License, v. 2.0. If a copy of the MPL was not distributed with this
ee3c462047d5 42 beta cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    12
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
ee3c462047d5 42 beta cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    13
 
ee3c462047d5 42 beta cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    14
 #include "nsISystemProxySettings.h"
ee3c462047d5 42 beta cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    15
 #include "mozilla/ModuleUtils.h"
ee3c462047d5 42 beta cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    16
 #include "nsIServiceManager.h"
ee3c462047d5 42 beta cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    17
 #include "nsIURI.h"
ee3c462047d5 42 beta cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    18
+#include "nsNetCID.h"
ee3c462047d5 42 beta cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    19
 #include "nsString.h"
ee3c462047d5 42 beta cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    20
 #include "nsCOMPtr.h"
ee3c462047d5 42 beta cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    21
 #include "nspr.h"
ee3c462047d5 42 beta cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    22
 
ee3c462047d5 42 beta cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    23
 extern "C" {
ee3c462047d5 42 beta cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    24
 #include <proxy.h>
ee3c462047d5 42 beta cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    25
 }
ee3c462047d5 42 beta cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    26