Bug 1311366, update to 4.13.1 to pick up a regression fix, r=ted

This commit is contained in:
Kai Engert 2016-10-21 12:34:54 +02:00
parent cc970ec261
commit 5fa2daa9c4
8 changed files with 9 additions and 9 deletions

View File

@ -1 +1 @@
NSPR_4_13_RTM
NSPR_4_13_1_RTM

View File

@ -10,3 +10,4 @@
*/
#error "Do not include this header file."

2
nsprpub/configure vendored
View File

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

View File

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

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.13"
#define PR_VERSION "4.13.1"
#define PR_VMAJOR 4
#define PR_VMINOR 13
#define PR_VPATCH 0
#define PR_VPATCH 1
#define PR_BETA PR_FALSE
/*

View File

@ -3338,7 +3338,6 @@ static PRFileDesc *pt_SetMethods(
case PR_DESC_PIPE:
fd->methods = PR_GetPipeMethods();
pt_MakeFdNonblock(osfd);
fd->secret->nonblocking = PR_TRUE;
break;
default:
break;

View File

@ -39,7 +39,7 @@ static char *compatible_version[] = {
"4.9.6",
"4.10", "4.10.1", "4.10.2", "4.10.3", "4.10.4",
"4.10.5", "4.10.6", "4.10.7", "4.10.8", "4.10.9",
"4.10.10", "4.11", "4.12",
"4.10.10", "4.11", "4.12", "4.13",
PR_VERSION
};
@ -55,7 +55,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.13.1",
"4.13.2",
"4.14", "4.14.1",
"10.0", "11.1", "12.14.20"
};

View File

@ -48,7 +48,7 @@ dnl ========================================================
MOZJPEG=62
MOZPNG=10625
NSPR_VERSION=4
NSPR_MINVER=4.13
NSPR_MINVER=4.13.1
NSS_VERSION=3
dnl Set the minimum version of toolkit libs used by mozilla