diff options
Diffstat (limited to 'nsprpub/pr/src/misc')
-rw-r--r-- | nsprpub/pr/src/misc/prdtoa.c | 11 | ||||
-rw-r--r-- | nsprpub/pr/src/misc/prnetdb.c | 4 | ||||
-rw-r--r-- | nsprpub/pr/src/misc/prsystem.c | 13 |
3 files changed, 14 insertions, 14 deletions
diff --git a/nsprpub/pr/src/misc/prdtoa.c b/nsprpub/pr/src/misc/prdtoa.c index f0963370f..51b331bac 100644 --- a/nsprpub/pr/src/misc/prdtoa.c +++ b/nsprpub/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/nsprpub/pr/src/misc/prnetdb.c b/nsprpub/pr/src/misc/prnetdb.c index 6ad0242d6..0f645b647 100644 --- a/nsprpub/pr/src/misc/prnetdb.c +++ b/nsprpub/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 diff --git a/nsprpub/pr/src/misc/prsystem.c b/nsprpub/pr/src/misc/prsystem.c index 825d3be0f..109f1ed23 100644 --- a/nsprpub/pr/src/misc/prsystem.c +++ b/nsprpub/pr/src/misc/prsystem.c @@ -152,6 +152,19 @@ PR_IMPLEMENT(PRStatus) PR_GetSystemInfo(PRSysInfo cmd, char *buf, PRUint32 bufle #endif /* OS2 */ break; + case PR_SI_RELEASE_BUILD: + /* Return the version of the operating system */ +#if defined(XP_UNIX) || defined(WIN32) + if (PR_FAILURE == _PR_MD_GETSYSINFO(cmd, buf, (PRUintn)buflen)) { + return PR_FAILURE; + } +#else + if (buflen) { + *buf = 0; + } +#endif /* XP_UNIX || WIN32 */ + break; + case PR_SI_ARCHITECTURE: /* Return the architecture of the machine (ie. x86, mips, alpha, ...)*/ (void)PR_snprintf(buf, buflen, _PR_SI_ARCHITECTURE); |