diff options
| author | athenian200 <athenian200@outlook.com> | 2020-07-29 18:52:42 -0500 |
|---|---|---|
| committer | athenian200 <athenian200@outlook.com> | 2020-07-29 18:52:42 -0500 |
| commit | efab8cdf38a61890551cee49dd8517ea56f5e137 (patch) | |
| tree | 2675592f99099b5d599c3ad1251e995a5da7c6fe /ldap/c-sdk/libldap | |
| parent | 9ac440aa71abf4357acea2efee1a26904468ea62 (diff) | |
| download | UXP-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/libldap')
| -rw-r--r-- | ldap/c-sdk/libldap/tmplout.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/ldap/c-sdk/libldap/tmplout.c b/ldap/c-sdk/libldap/tmplout.c index 0dded6b4c..fae0b94d5 100644 --- a/ldap/c-sdk/libldap/tmplout.c +++ b/ldap/c-sdk/libldap/tmplout.c @@ -43,16 +43,11 @@ #include "ldap-int.h" #include "disptmpl.h" -#if defined(_WINDOWS) || defined(aix) || defined(SCOOS) || defined(OSF1) || defined(SOLARIS) +#if defined(_WINDOWS) || defined(aix) || defined(SCOOS) || defined(OSF1) || defined(XP_SOLARIS) #include <time.h> /* for struct tm and ctime */ #endif -/* This is totally lame, since it should be coming from time.h, but isn't. */ -#if defined(SOLARIS) -char *ctime_r(const time_t *, char *, int); -#endif - static int do_entry2text( LDAP *ld, char *buf, char *base, LDAPMessage *entry, struct ldap_disptmpl *tmpl, char **defattrs, char ***defvals, writeptype writeproc, void *writeparm, char *eol, int rdncount, |