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

Unified Diff: patches/nspr-remove-io.patch

Issue 1504923011: Update NSS to 3.21 RTM and NSPR to 4.11 RTM (Closed) Base URL: http://src.chromium.org/svn/trunk/deps/third_party/nss
Patch Set: Created 5 years 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-remove-io.patch
diff --git a/patches/nspr-remove-io.patch b/patches/nspr-remove-io.patch
index fa626ce6396cb17462b0ed0107ace5dfbc6cba53..3855ea1500c7466bd2e3736839ad43347730c8cf 100644
--- a/patches/nspr-remove-io.patch
+++ b/patches/nspr-remove-io.patch
@@ -1,10 +1,7 @@
-Index: mozilla/nsprpub/pr/include/md/_win95.h
-===================================================================
-RCS file: /cvsroot/mozilla/nsprpub/pr/include/md/_win95.h,v
-retrieving revision 3.41
-diff -p -u -r3.41 _win95.h
---- mozilla/nsprpub/pr/include/md/_win95.h 26 May 2012 00:15:23 -0000 3.41
-+++ mozilla/nsprpub/pr/include/md/_win95.h 29 Jan 2013 01:19:17 -0000
+diff --git a/pr/include/md/_win95.h b/pr/include/md/_win95.h
+index d65e264..1da2b55 100644
+--- a/pr/include/md/_win95.h
++++ b/pr/include/md/_win95.h
@@ -32,8 +32,6 @@
#define HAVE_DLL
@@ -14,13 +11,10 @@ diff -p -u -r3.41 _win95.h
#ifndef _PR_INET6
#define AF_INET6 23
/* newer ws2tcpip.h provides these */
-Index: mozilla/nsprpub/pr/src/io/prio.c
-===================================================================
-RCS file: /cvsroot/mozilla/nsprpub/pr/src/io/prio.c,v
-retrieving revision 3.24
-diff -p -u -r3.24 prio.c
---- mozilla/nsprpub/pr/src/io/prio.c 6 Mar 2012 13:14:09 -0000 3.24
-+++ mozilla/nsprpub/pr/src/io/prio.c 29 Jan 2013 01:19:17 -0000
+diff --git a/pr/src/io/prio.c b/pr/src/io/prio.c
+index 78cbdf5..f69927f 100644
+--- a/pr/src/io/prio.c
++++ b/pr/src/io/prio.c
@@ -58,8 +58,6 @@ void _PR_InitIO(void)
_PR_MD_INIT_FD_INHERITABLE(_pr_stdin, PR_TRUE);
_PR_MD_INIT_FD_INHERITABLE(_pr_stdout, PR_TRUE);

Powered by Google App Engine
This is Rietveld 408576698