Bug 1600803 - NSPR_4_25_RTM for Firefox 74. r=kjacobs UPGRADE_NSPR_RELEASE

Differential Revision: https://phabricator.services.mozilla.com/D61379

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Kai Engert 2020-02-03 12:17:20 +00:00
parent 90759ceddb
commit 91f084ace4
5 changed files with 8 additions and 4 deletions

View File

@ -1 +1 @@
NSPR_4_25_BETA1 NSPR_4_25_RTM

View File

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

View File

@ -1157,7 +1157,8 @@
#define PR_BYTES_PER_WORD_LOG2 2 #define PR_BYTES_PER_WORD_LOG2 2
#define PR_BYTES_PER_DWORD_LOG2 3 #define PR_BYTES_PER_DWORD_LOG2 3
#elif defined(__nios2__) || defined(__microblaze__) || defined(__nds32__) #elif defined(__nios2__) || defined(__microblaze__) || defined(__nds32__) || \
defined(__xtensa__)
#if defined(__microblaze__) && defined(__BIG_ENDIAN__) #if defined(__microblaze__) && defined(__BIG_ENDIAN__)
#define IS_BIG_ENDIAN 1 #define IS_BIG_ENDIAN 1

View File

@ -69,6 +69,8 @@
#define _PR_SI_ARCHITECTURE "microblaze" #define _PR_SI_ARCHITECTURE "microblaze"
#elif defined(__nds32__) #elif defined(__nds32__)
#define _PR_SI_ARCHITECTURE "nds32" #define _PR_SI_ARCHITECTURE "nds32"
#elif defined(__xtensa__)
#define _PR_SI_ARCHITECTURE "xtensa"
#else #else
#error "Unknown CPU architecture" #error "Unknown CPU architecture"
#endif #endif

View File

@ -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.25 Beta" #define PR_VERSION "4.25"
#define PR_VMAJOR 4 #define PR_VMAJOR 4
#define PR_VMINOR 25 #define PR_VMINOR 25
#define PR_VPATCH 0 #define PR_VPATCH 0
#define PR_BETA PR_TRUE #define PR_BETA PR_FALSE
/* /*
** PRVersionCheck ** PRVersionCheck