patches/nspr-remove-io.patch - Issue 1504923011: Update NSS to 3.21 RTM and NSPR to 4.11 RTM

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side 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 unified diff | Download patch | Annotate | Revision Log

OLD	NEW
1 Index: mozilla/nsprpub/pr/include/md/_win95.h	1 diff --git a/pr/include/md/_win95.h b/pr/include/md/_win95.h

2 ===================================================================	2 index d65e264..1da2b55 100644

3 RCS file: /cvsroot/mozilla/nsprpub/pr/include/md/_win95.h,v	3 --- a/pr/include/md/_win95.h

4 retrieving revision 3.41	4 +++ b/pr/include/md/_win95.h

5 diff -p -u -r3.41 _win95.h

6 --- mozilla/nsprpub/pr/include/md/_win95.h» 26 May 2012 00:15:23 -0000» 3.41

7 +++ mozilla/nsprpub/pr/include/md/_win95.h» 29 Jan 2013 01:19:17 -0000

8 @@ -32,8 +32,6 @@	5 @@ -32,8 +32,6 @@

9	6

10 #define HAVE_DLL	7 #define HAVE_DLL

11 #undef HAVE_THREAD_AFFINITY	8 #undef HAVE_THREAD_AFFINITY

12 -#define _PR_HAVE_GETADDRINFO	9 -#define _PR_HAVE_GETADDRINFO

13 -#define _PR_INET6_PROBE	10 -#define _PR_INET6_PROBE

14 #ifndef _PR_INET6	11 #ifndef _PR_INET6

15 #define AF_INET6 23	12 #define AF_INET6 23

16 /* newer ws2tcpip.h provides these */	13 /* newer ws2tcpip.h provides these */

17 Index: mozilla/nsprpub/pr/src/io/prio.c	14 diff --git a/pr/src/io/prio.c b/pr/src/io/prio.c

18 ===================================================================	15 index 78cbdf5..f69927f 100644

19 RCS file: /cvsroot/mozilla/nsprpub/pr/src/io/prio.c,v	16 --- a/pr/src/io/prio.c

20 retrieving revision 3.24	17 +++ b/pr/src/io/prio.c

21 diff -p -u -r3.24 prio.c

22 --- mozilla/nsprpub/pr/src/io/prio.c» 6 Mar 2012 13:14:09 -0000» 3.24

23 +++ mozilla/nsprpub/pr/src/io/prio.c» 29 Jan 2013 01:19:17 -0000

24 @@ -58,8 +58,6 @@ void _PR_InitIO(void)	18 @@ -58,8 +58,6 @@ void _PR_InitIO(void)

25 _PR_MD_INIT_FD_INHERITABLE(_pr_stdin, PR_TRUE);	19 _PR_MD_INIT_FD_INHERITABLE(_pr_stdin, PR_TRUE);

26 _PR_MD_INIT_FD_INHERITABLE(_pr_stdout, PR_TRUE);	20 _PR_MD_INIT_FD_INHERITABLE(_pr_stdout, PR_TRUE);

27 _PR_MD_INIT_FD_INHERITABLE(_pr_stderr, PR_TRUE);	21 _PR_MD_INIT_FD_INHERITABLE(_pr_stderr, PR_TRUE);

28 -	22 -

29 - _PR_MD_INIT_IO();	23 - _PR_MD_INIT_IO();

30 }	24 }

31	25

32 void _PR_CleanupIO(void)	26 void _PR_CleanupIO(void)

OLD	NEW

« nss/lib/util/pkcs11n.h ('K') | « patches/nspr-attach-as-system-thread.patch ('k') | patches/nspr-static.patch » ('j') | no next file with comments »