diff options
| author | Mike Hommey <mh@glandium.org> | 2020-08-20 17:01:43 +0000 |
|---|---|---|
| committer | Mike Hommey <mh@glandium.org> | 2020-08-20 17:01:43 +0000 |
| commit | fd04d1db65c74d7792f473151360b727bc8341df (patch) | |
| tree | 29fae68360184f84ff17cc25bb127543e316833b /pr/src | |
| parent | 9a9e911bcd185d2898a6772ddd5463a39f83255d (diff) | |
| download | nspr-hg-fd04d1db65c74d7792f473151360b727bc8341df.tar.gz | |
Bug 484411 - Remove XP_MACOSX and OS_TARGET=MacOSX. r=kaie
With support for macOS < 10.3 dropped, we don't need to care about
special cases for 10.1 anymore, which were the last places using
XP_MACOSX, which we can remove. And as per the previous change,
OS_TARGET=MacOSX is not used anymore. The value will now be Darwin
on all Darwin-based platforms. Also, as per the previous change,
we don't need to check for Carbon anymore.
Differential Revision: https://phabricator.services.mozilla.com/D86793
Diffstat (limited to 'pr/src')
| -rw-r--r-- | pr/src/misc/prdtoa.c | 11 | ||||
| -rw-r--r-- | pr/src/misc/prnetdb.c | 4 |
2 files changed, 1 insertions, 14 deletions
diff --git a/pr/src/misc/prdtoa.c b/pr/src/misc/prdtoa.c index f0963370..51b331ba 100644 --- a/pr/src/misc/prdtoa.c +++ b/pr/src/misc/prdtoa.c @@ -304,17 +304,6 @@ static double private_mem[PRIVATE_mem], *pmem_next = private_mem; #else /* ifndef Bad_float_h */ #include "float.h" -/* - * MacOS 10.2 defines the macro FLT_ROUNDS to an internal function - * which does not exist on 10.1. We can safely #define it to 1 here - * to allow 10.2 builds to run on 10.1, since we can't use fesetround() - * (which does not exist on 10.1 either). - */ -#if defined(XP_MACOSX) && (!defined(MAC_OS_X_VERSION_10_2) || \ - MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_2) -#undef FLT_ROUNDS -#define FLT_ROUNDS 1 -#endif /* DT < 10.2 */ #endif /* Bad_float_h */ #ifndef __MATH_H__ diff --git a/pr/src/misc/prnetdb.c b/pr/src/misc/prnetdb.c index 6ad0242d..0f645b64 100644 --- a/pr/src/misc/prnetdb.c +++ b/pr/src/misc/prnetdb.c @@ -166,9 +166,7 @@ static PRBool _pr_have_inet6_if = PR_FALSE; #undef DEBUG_QUERY_IFS #if defined(AIX) \ - || (defined(DARWIN) && (!defined(HAVE_GETIFADDRS) \ - || (defined(XP_MACOSX) && (!defined(MAC_OS_X_VERSION_10_2) || \ - MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_2)))) + || (defined(DARWIN) && !defined(HAVE_GETIFADDRS)) /* * Use SIOCGIFCONF ioctl on platforms that don't have routing |