Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(531)

Unified Diff: patches/nspr-static.patch

Issue 1843333003: Update NSPR to 4.12 and NSS to 3.23 on iOS (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/nss.git@master
Patch Set: Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: patches/nspr-static.patch
diff --git a/patches/nspr-static.patch b/patches/nspr-static.patch
index b6a4a38b53052b48c995e74de7b1bacaaf25e737..aff0f8b32a8b01886f3444204a8f10dce794acf4 100644
--- a/patches/nspr-static.patch
+++ b/patches/nspr-static.patch
@@ -1,7 +1,7 @@
-diff --git a/pr/include/prtypes.h b/pr/include/prtypes.h
+diff --git a/nspr/pr/include/prtypes.h b/nspr/pr/include/prtypes.h
index 52b3ab0..d78f580 100644
---- a/pr/include/prtypes.h
-+++ b/pr/include/prtypes.h
+--- a/nspr/pr/include/prtypes.h
++++ b/nspr/pr/include/prtypes.h
@@ -48,7 +48,23 @@
**
**
@@ -27,10 +27,10 @@ index 52b3ab0..d78f580 100644
#define PR_EXPORT(__type) extern __declspec(dllexport) __type
#define PR_EXPORT_DATA(__type) extern __declspec(dllexport) __type
-diff --git a/pr/src/md/windows/w95dllmain.c b/pr/src/md/windows/w95dllmain.c
+diff --git a/nspr/pr/src/md/windows/w95dllmain.c b/nspr/pr/src/md/windows/w95dllmain.c
index 73707a6..90957c1 100644
---- a/pr/src/md/windows/w95dllmain.c
-+++ b/pr/src/md/windows/w95dllmain.c
+--- a/nspr/pr/src/md/windows/w95dllmain.c
++++ b/nspr/pr/src/md/windows/w95dllmain.c
@@ -3,6 +3,8 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -46,11 +46,11 @@ index 73707a6..90957c1 100644
}
+
+#endif
-diff --git a/pr/src/md/windows/w95thred.c b/pr/src/md/windows/w95thred.c
-index 932c50c..f5c7703 100644
---- a/pr/src/md/windows/w95thred.c
-+++ b/pr/src/md/windows/w95thred.c
-@@ -318,3 +318,120 @@ PRThread *thread;
+diff --git a/nspr/pr/src/md/windows/w95thred.c b/nspr/pr/src/md/windows/w95thred.c
+index c27d982..52bfb02 100644
+--- a/nspr/pr/src/md/windows/w95thred.c
++++ b/nspr/pr/src/md/windows/w95thred.c
+@@ -323,3 +323,120 @@ PRThread *thread;
PR_ASSERT(thread != NULL);
return thread;
}

Powered by Google App Engine
This is Rietveld 408576698