зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1656520 - NSPR_4_28_BETA1. r=kjacobs UPGRADE_NSPR_RELEASE
Differential Revision: https://phabricator.services.mozilla.com/D85602
This commit is contained in:
Родитель
f5fc6a6274
Коммит
d0109fca04
|
@ -1 +1 @@
|
||||||
NSPR_4_27_RTM
|
NSPR_4_28_BETA1
|
|
@ -10,4 +10,3 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#error "Do not include this header file."
|
#error "Do not include this header file."
|
||||||
|
|
||||||
|
|
|
@ -2486,7 +2486,7 @@ test -n "$target_alias" &&
|
||||||
program_prefix=${target_alias}-
|
program_prefix=${target_alias}-
|
||||||
|
|
||||||
MOD_MAJOR_VERSION=4
|
MOD_MAJOR_VERSION=4
|
||||||
MOD_MINOR_VERSION=27
|
MOD_MINOR_VERSION=28
|
||||||
MOD_PATCH_VERSION=0
|
MOD_PATCH_VERSION=0
|
||||||
NSPR_MODNAME=nspr20
|
NSPR_MODNAME=nspr20
|
||||||
_HAVE_PTHREADS=
|
_HAVE_PTHREADS=
|
||||||
|
|
|
@ -15,7 +15,7 @@ dnl ========================================================
|
||||||
dnl = Defaults
|
dnl = Defaults
|
||||||
dnl ========================================================
|
dnl ========================================================
|
||||||
MOD_MAJOR_VERSION=4
|
MOD_MAJOR_VERSION=4
|
||||||
MOD_MINOR_VERSION=27
|
MOD_MINOR_VERSION=28
|
||||||
MOD_PATCH_VERSION=0
|
MOD_PATCH_VERSION=0
|
||||||
NSPR_MODNAME=nspr20
|
NSPR_MODNAME=nspr20
|
||||||
_HAVE_PTHREADS=
|
_HAVE_PTHREADS=
|
||||||
|
@ -821,6 +821,7 @@ if test -n "$CROSS_COMPILE"; then
|
||||||
linux*) OS_ARCH=Linux ;;
|
linux*) OS_ARCH=Linux ;;
|
||||||
solaris*) OS_ARCH=SunOS OS_RELEASE=5 ;;
|
solaris*) OS_ARCH=SunOS OS_RELEASE=5 ;;
|
||||||
mingw*) OS_ARCH=WINNT CPU_ARCH=x86 ;;
|
mingw*) OS_ARCH=WINNT CPU_ARCH=x86 ;;
|
||||||
|
cygwin*) OS_ARCH=WINNT ;;
|
||||||
darwin*) OS_ARCH=Darwin ;;
|
darwin*) OS_ARCH=Darwin ;;
|
||||||
riscos*) OS_ARCH=RISCOS ;;
|
riscos*) OS_ARCH=RISCOS ;;
|
||||||
esac
|
esac
|
||||||
|
|
|
@ -31,11 +31,11 @@ PR_BEGIN_EXTERN_C
|
||||||
** The format of the version string is
|
** The format of the version string is
|
||||||
** "<major version>.<minor version>[.<patch level>] [<Beta>]"
|
** "<major version>.<minor version>[.<patch level>] [<Beta>]"
|
||||||
*/
|
*/
|
||||||
#define PR_VERSION "4.27"
|
#define PR_VERSION "4.28 Beta"
|
||||||
#define PR_VMAJOR 4
|
#define PR_VMAJOR 4
|
||||||
#define PR_VMINOR 27
|
#define PR_VMINOR 28
|
||||||
#define PR_VPATCH 0
|
#define PR_VPATCH 0
|
||||||
#define PR_BETA PR_FALSE
|
#define PR_BETA PR_TRUE
|
||||||
|
|
||||||
/*
|
/*
|
||||||
** PRVersionCheck
|
** PRVersionCheck
|
||||||
|
|
|
@ -807,7 +807,7 @@ pr_LoadLibraryByPathname(const char *name, PRIntn flags)
|
||||||
const size_t systemPrefixLen1 = strlen(systemPrefix1);
|
const size_t systemPrefixLen1 = strlen(systemPrefix1);
|
||||||
const char systemPrefix2[] = "/usr/lib/";
|
const char systemPrefix2[] = "/usr/lib/";
|
||||||
const size_t systemPrefixLen2 = strlen(systemPrefix2);
|
const size_t systemPrefixLen2 = strlen(systemPrefix2);
|
||||||
const name_len = strlen(name);
|
const size_t name_len = strlen(name);
|
||||||
if (((name_len > systemPrefixLen1) &&
|
if (((name_len > systemPrefixLen1) &&
|
||||||
(strncmp(name, systemPrefix1, systemPrefixLen1) == 0)) ||
|
(strncmp(name, systemPrefix1, systemPrefixLen1) == 0)) ||
|
||||||
((name_len > systemPrefixLen2) &&
|
((name_len > systemPrefixLen2) &&
|
||||||
|
|
|
@ -41,7 +41,7 @@ static char *compatible_version[] = {
|
||||||
"4.10.5", "4.10.6", "4.10.7", "4.10.8", "4.10.9",
|
"4.10.5", "4.10.6", "4.10.7", "4.10.8", "4.10.9",
|
||||||
"4.10.10", "4.11", "4.12", "4.13", "4.14", "4.15",
|
"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.16", "4.17", "4.18", "4.19", "4.20", "4.21", "4.22",
|
||||||
"4.23", "4.24", "4.25", "4,26",
|
"4.23", "4.24", "4.25", "4,26", "4.27",
|
||||||
PR_VERSION
|
PR_VERSION
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -57,8 +57,8 @@ static char *incompatible_version[] = {
|
||||||
"3.0", "3.0.1",
|
"3.0", "3.0.1",
|
||||||
"3.1", "3.1.1", "3.1.2", "3.1.3",
|
"3.1", "3.1.1", "3.1.2", "3.1.3",
|
||||||
"3.5", "3.5.1",
|
"3.5", "3.5.1",
|
||||||
"4.27.1",
|
"4.28.1",
|
||||||
"4.28", "4.28.1",
|
"4.29", "4.29.1",
|
||||||
"10.0", "11.1", "12.14.20"
|
"10.0", "11.1", "12.14.20"
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче