diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-07-18 08:24:24 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-07-18 08:24:24 +0200 |
| commit | fc61780b35af913801d72086456f493f63197da6 (patch) | |
| tree | f85891288a7bd988da9f0f15ae64e5c63f00d493 /nsprpub/configure | |
| parent | 69f7f9e5f1475891ce11cc4f431692f965b0cd30 (diff) | |
| parent | 50d3e596bbe89c95615f96eb71f6bc5be737a1db (diff) | |
| download | UXP-9ccb235f04529c1ec345d87dad6521cb567d20bb.tar UXP-9ccb235f04529c1ec345d87dad6521cb567d20bb.tar.gz UXP-9ccb235f04529c1ec345d87dad6521cb567d20bb.tar.lz UXP-9ccb235f04529c1ec345d87dad6521cb567d20bb.tar.xz UXP-9ccb235f04529c1ec345d87dad6521cb567d20bb.zip | |
Merge commit '50d3e596bbe89c95615f96eb71f6bc5be737a1db' into Basilisk-releasev2018.07.18
# Conflicts:
# browser/app/profile/firefox.js
# browser/components/preferences/jar.mn
Diffstat (limited to 'nsprpub/configure')
| -rwxr-xr-x | nsprpub/configure | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/nsprpub/configure b/nsprpub/configure index b8ad2b4eb..619d193ae 100755 --- a/nsprpub/configure +++ b/nsprpub/configure @@ -2488,7 +2488,7 @@ test -n "$target_alias" && program_prefix=${target_alias}- MOD_MAJOR_VERSION=4 -MOD_MINOR_VERSION=16 +MOD_MINOR_VERSION=19 MOD_PATCH_VERSION=0 NSPR_MODNAME=nspr20 _HAVE_PTHREADS= @@ -6560,11 +6560,13 @@ fi $as_echo "#define HAVE_POINTER_LOCALTIME_R 1" >>confdefs.h + HOST_DARWIN_MAJOR=`echo "$build_os" | sed -E -e 's/^darwin([0-9]+).*$/\1/'` + if test "$HOST_DARWIN_MAJOR" -ge 15 ; then $as_echo "#define HAS_CONNECTX 1" >>confdefs.h - fi + fi AS='$(CC) -x assembler-with-cpp' CFLAGS="$CFLAGS -Wall -fno-common" case "${target_cpu}" in @@ -8472,19 +8474,12 @@ case "$target" in fi if test "$USE_PTHREADS"; then - if echo "$OS_RELEASE" | egrep '^(B.10.10|B.10.20)' >/dev/null; then - $as_echo "#define _REENTRANT 1" >>confdefs.h - - $as_echo "#define _PR_DCETHREADS 1" >>confdefs.h - - else - cat >>confdefs.h <<_ACEOF + cat >>confdefs.h <<_ACEOF #define _POSIX_C_SOURCE 199506L _ACEOF - $as_echo "#define _PR_HAVE_THREADSAFE_GETHOST 1" >>confdefs.h + $as_echo "#define _PR_HAVE_THREADSAFE_GETHOST 1" >>confdefs.h - fi fi if test "$USE_USER_PTHREADS"; then cat >>confdefs.h <<_ACEOF |