nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1782740 - Update to NSPR 4.34.1 RTM. r=bbeurdouche UPGRADE_NSPR_RELEASE

Browse source 
Differential Revision: https://phabricator.services.mozilla.com/D153800
This commit is contained in:
Kai Engert 2022-08-05 09:51:21 +00:00
parent 4157897986
commit 965d146114
6 changed files with 13 additions and 8 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

2
nsprpub/TAG-INFO
View file

@ -1 +1 @@
NSPR_4_34_RTM
NSPR_4_34_1_RTM

2
nsprpub/configure vendored
View file

@ -2487,7 +2487,7 @@ test -n "$target_alias" &&
MOD_MAJOR_VERSION=4
MOD_MINOR_VERSION=34
MOD_PATCH_VERSION=0
MOD_PATCH_VERSION=1
NSPR_MODNAME=nspr20
_HAVE_PTHREADS=
USE_PTHREADS=

2
nsprpub/configure.in
View file

@ -16,7 +16,7 @@ dnl = Defaults
dnl ========================================================
MOD_MAJOR_VERSION=4
MOD_MINOR_VERSION=34
MOD_PATCH_VERSION=0
MOD_PATCH_VERSION=1
NSPR_MODNAME=nspr20
_HAVE_PTHREADS=
USE_PTHREADS=

4
nsprpub/pr/include/prinit.h
View file

@ -31,10 +31,10 @@ PR_BEGIN_EXTERN_C
** The format of the version string is
** "<major version>.<minor version>[.<patch level>] [<Beta>]"
*/
#define PR_VERSION "4.34"
#define PR_VERSION "4.34.1"
#define PR_VMAJOR 4
#define PR_VMINOR 34
#define PR_VPATCH 0
#define PR_VPATCH 1
#define PR_BETA PR_FALSE
/*

7
nsprpub/pr/src/md/unix/unix.c
View file

@ -3641,7 +3641,8 @@ int poll(struct pollfd *filedes, unsigned long nfds, int timeout)
int events = filedes[i].events;
PRBool fdHasEvent = PR_FALSE;
if (osfd < 0) {
PR_ASSERT(osfd < FD_SETSIZE);
if (osfd < 0 || osfd >= FD_SETSIZE) {
continue; /* Skip this osfd. */
}
@ -3686,6 +3687,10 @@ int poll(struct pollfd *filedes, unsigned long nfds, int timeout)
if (filedes[i].fd < 0) {
continue;
}
if (filedes[i].fd >= FD_SETSIZE) {
filedes[i].revents |= POLLNVAL;
continue;
}
if (FD_ISSET(filedes[i].fd, &rd)) {
if (filedes[i].events & POLLIN) {
filedes[i].revents |= POLLIN;

4
nsprpub/pr/tests/vercheck.c
View file

@ -42,7 +42,7 @@ static char *compatible_version[] = {
"4.10.10", "4.11", "4.12", "4.13", "4.14", "4.15",
"4.16", "4.17", "4.18", "4.19", "4.20", "4.21", "4.22",
"4.23", "4.24", "4.25", "4,26", "4.27", "4.28", "4.29",
"4.30", "4.31", "4.32", "4.33",
"4.30", "4.31", "4.32", "4.33", "4.34",
PR_VERSION
};
@ -58,7 +58,7 @@ static char *incompatible_version[] = {
"3.0", "3.0.1",
"3.1", "3.1.1", "3.1.2", "3.1.3",
"3.5", "3.5.1",
"4.34.1",
"4.34.2",
"4.35", "4.35.1",
"10.0", "11.1", "12.14.20"
};