mozilla-system-nspr.patch
author Wolfgang Rosenauer <wr@rosenauer.org>
Tue, 25 Aug 2020 21:31:17 +0200
branchfirefox80
changeset 1142 c5e32127317c
parent 1141 edb0ebe8cccc
permissions -rw-r--r--
further FIPS patch (from https://github.com/openSUSE/firefox-maintenance/commit/23d322af9566055af016e6e409dcc3c9856c3666)
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1141
edb0ebe8cccc Firefox 80.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     1
# HG changeset patch
edb0ebe8cccc Firefox 80.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     2
# User Wolfgang Rosenauer <wr@rosenauer.org>
edb0ebe8cccc Firefox 80.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     3
# Parent  3804871eac4171b99e9049dbc881b5304b5ac207
edb0ebe8cccc Firefox 80.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     4
edb0ebe8cccc Firefox 80.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     5
diff --git a/dom/system/IOUtils.cpp b/dom/system/IOUtils.cpp
edb0ebe8cccc Firefox 80.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     6
--- a/dom/system/IOUtils.cpp
edb0ebe8cccc Firefox 80.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     7
+++ b/dom/system/IOUtils.cpp
edb0ebe8cccc Firefox 80.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     8
@@ -9,19 +9,19 @@
edb0ebe8cccc Firefox 80.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     9
 #include "mozilla/dom/IOUtils.h"
edb0ebe8cccc Firefox 80.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    10
 #include "mozilla/dom/Promise.h"
edb0ebe8cccc Firefox 80.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    11
 #include "mozilla/ErrorNames.h"
edb0ebe8cccc Firefox 80.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    12
 #include "mozilla/Result.h"
edb0ebe8cccc Firefox 80.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    13
 #include "mozilla/ResultExtensions.h"
edb0ebe8cccc Firefox 80.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    14
 #include "mozilla/Services.h"
edb0ebe8cccc Firefox 80.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    15
 #include "mozilla/Span.h"
edb0ebe8cccc Firefox 80.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    16
 #include "mozilla/TextUtils.h"
edb0ebe8cccc Firefox 80.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    17
-#include "nspr/prio.h"
edb0ebe8cccc Firefox 80.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    18
-#include "nspr/private/pprio.h"
edb0ebe8cccc Firefox 80.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    19
-#include "nspr/prtypes.h"
edb0ebe8cccc Firefox 80.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    20
+#include "prio.h"
edb0ebe8cccc Firefox 80.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    21
+#include "private/pprio.h"
edb0ebe8cccc Firefox 80.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    22
+#include "prtypes.h"
edb0ebe8cccc Firefox 80.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    23
 #include "nsDirectoryServiceDefs.h"
edb0ebe8cccc Firefox 80.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    24
 #include "nsIFile.h"
edb0ebe8cccc Firefox 80.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    25
 #include "nsIGlobalObject.h"
edb0ebe8cccc Firefox 80.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    26
 #include "nsNativeCharsetUtils.h"
edb0ebe8cccc Firefox 80.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    27
 #include "nsReadableUtils.h"
edb0ebe8cccc Firefox 80.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    28
 #include "nsString.h"
edb0ebe8cccc Firefox 80.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    29
 #include "nsThreadManager.h"
edb0ebe8cccc Firefox 80.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    30
 #include "SpecialSystemDirectory.h"
edb0ebe8cccc Firefox 80.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    31
diff --git a/dom/system/IOUtils.h b/dom/system/IOUtils.h
edb0ebe8cccc Firefox 80.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    32
--- a/dom/system/IOUtils.h
edb0ebe8cccc Firefox 80.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    33
+++ b/dom/system/IOUtils.h
edb0ebe8cccc Firefox 80.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    34
@@ -9,17 +9,17 @@
edb0ebe8cccc Firefox 80.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    35
 
edb0ebe8cccc Firefox 80.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    36
 #include "mozilla/AlreadyAddRefed.h"
edb0ebe8cccc Firefox 80.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    37
 #include "mozilla/DataMutex.h"
edb0ebe8cccc Firefox 80.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    38
 #include "mozilla/dom/BindingDeclarations.h"
edb0ebe8cccc Firefox 80.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    39
 #include "mozilla/dom/IOUtilsBinding.h"
edb0ebe8cccc Firefox 80.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    40
 #include "mozilla/dom/TypedArray.h"
edb0ebe8cccc Firefox 80.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    41
 #include "mozilla/ErrorResult.h"
edb0ebe8cccc Firefox 80.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    42
 #include "mozilla/MozPromise.h"
edb0ebe8cccc Firefox 80.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    43
-#include "nspr/prio.h"
edb0ebe8cccc Firefox 80.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    44
+#include "prio.h"
edb0ebe8cccc Firefox 80.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    45
 #include "nsIAsyncShutdown.h"
edb0ebe8cccc Firefox 80.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    46
 #include "nsISerialEventTarget.h"
edb0ebe8cccc Firefox 80.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    47
 #include "nsLocalFile.h"
edb0ebe8cccc Firefox 80.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    48
 
edb0ebe8cccc Firefox 80.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    49
 namespace mozilla {
edb0ebe8cccc Firefox 80.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    50
 
edb0ebe8cccc Firefox 80.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    51
 /**
edb0ebe8cccc Firefox 80.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    52
  * Utility class to be used with |UniquePtr| to automatically close NSPR file