wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1215200, NSPR_4_10_10_RTM and NSS 3_20_1_RTM, bump version requirements, r=keeler

Browse Source
This commit is contained in:
Kai Engert 2015-10-20 12:34:15 +02:00
parent 05ee74b6b0
commit 2274132a18
7 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.in
View File

@ -53,7 +53,7 @@ dnl ========================================================
MOZJPEG=62
MOZPNG=10617
NSPR_VERSION=4
NSPR_MINVER=4.10.8
NSPR_MINVER=4.10.10
NSS_VERSION=3
dnl Set the minimum version of toolkit libs used by mozilla
@ -3427,7 +3427,7 @@ MOZ_ARG_WITH_BOOL(system-nss,
_USE_SYSTEM_NSS=1 )
if test -n "$_USE_SYSTEM_NSS"; then
AM_PATH_NSS(3.19.2, [MOZ_NATIVE_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])])
AM_PATH_NSS(3.20.1, [MOZ_NATIVE_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])])
fi
if test -n "$MOZ_NATIVE_NSS"; then

2
nsprpub/TAG-INFO
View File

@ -1 +1 @@
NSPR_4_10_10_RC1
NSPR_4_10_10_RTM

1
nsprpub/config/prdepend.h
View File

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

10
nsprpub/pr/include/md/_linux.h
View File

@ -162,16 +162,6 @@ extern PRInt32 _PR_ppc_AtomicSet(PRInt32 *val, PRInt32 newval);
#endif
#endif
#if defined(__mips__) && defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4)
/* Use GCC built-in functions */
#define _PR_HAVE_ATOMIC_OPS
#define _MD_INIT_ATOMIC()
#define _MD_ATOMIC_INCREMENT(ptr) __sync_add_and_fetch(ptr, 1)
#define _MD_ATOMIC_DECREMENT(ptr) __sync_sub_and_fetch(ptr, 1)
#define _MD_ATOMIC_ADD(ptr, i) __sync_add_and_fetch(ptr, i)
#define _MD_ATOMIC_SET(ptr, nv) __sync_lock_test_and_set(ptr, nv)
#endif
#if defined(__alpha)
#define _PR_HAVE_ATOMIC_OPS
#define _MD_INIT_ATOMIC()

4
nsprpub/pr/include/pratom.h
View File

@ -107,9 +107,7 @@ NSPR_API(PRInt32) PR_AtomicAdd(PRInt32 *ptr, PRInt32 val);
defined(__powerpc__) || \
(defined(__arm__) && \
defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4)) || \
defined(__aarch64__) || defined(__alpha) || \
(defined(__mips__) && \
defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4)))))
defined(__aarch64__) || defined(__alpha))))
/*
* Because the GCC manual warns that some processors may support

2
security/nss/TAG-INFO
View File

@ -1 +1 @@
NSS_3_20_1_RC0
NSS_3_20_1_RTM

1
security/nss/coreconf/coreconf.dep
View File

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