summaryrefslogtreecommitdiffstats
path: root/ldap/c-sdk/include/portable.h
diff options
context:
space:
mode:
authorathenian200 <athenian200@outlook.com>2020-07-29 18:52:42 -0500
committerathenian200 <athenian200@outlook.com>2020-07-29 18:52:42 -0500
commitefab8cdf38a61890551cee49dd8517ea56f5e137 (patch)
tree2675592f99099b5d599c3ad1251e995a5da7c6fe /ldap/c-sdk/include/portable.h
parent9ac440aa71abf4357acea2efee1a26904468ea62 (diff)
downloadUXP-efab8cdf38a61890551cee49dd8517ea56f5e137.tar
UXP-efab8cdf38a61890551cee49dd8517ea56f5e137.tar.gz
UXP-efab8cdf38a61890551cee49dd8517ea56f5e137.tar.lz
UXP-efab8cdf38a61890551cee49dd8517ea56f5e137.tar.xz
UXP-efab8cdf38a61890551cee49dd8517ea56f5e137.zip
Issue #1615 - SunOS LDAP cleanup.
I meant to do this a long time ago, but basically it accounts for the new XP_SOLARIS build flag that never made it into the MailNews code. Additionally, it enables a compatibility flag for Solaris 11.4 that allows us to use the three-argument implementation of ctime_r still used by Solaris 11.3 and illumos (which also appears equivalent to the NSLDAPI_CTIME implementation used by libldap internally). Also, the ctime_r function has been added to the time.h header library for a while now, not sure why Mozilla thought we didn't have a ctime_r implementation.
Diffstat (limited to 'ldap/c-sdk/include/portable.h')
-rw-r--r--ldap/c-sdk/include/portable.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/ldap/c-sdk/include/portable.h b/ldap/c-sdk/include/portable.h
index 52698867f..d61d8535f 100644
--- a/ldap/c-sdk/include/portable.h
+++ b/ldap/c-sdk/include/portable.h
@@ -59,7 +59,7 @@
*/
#ifndef SYSV
-#if defined( hpux ) || defined( SOLARIS ) || defined ( sgi ) || defined( SVR4 )
+#if defined( hpux ) || defined(XP_SOLARIS) || defined ( sgi ) || defined( SVR4 )
#define SYSV
#endif
#endif
@@ -191,7 +191,7 @@
*/
#if !defined(NSLDAPI_CONNECT_MUST_NOT_BE_INTERRUPTED) && \
( defined(AIX) || defined(IRIX) || defined(HPUX) || defined(SUNOS4) \
- || defined(SOLARIS) || defined(OSF1) ||defined(freebsd))
+ || defined(XP_SOLARIS) || defined(OSF1) ||defined(freebsd))
#define NSLDAPI_CONNECT_MUST_NOT_BE_INTERRUPTED
#endif