summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMoonchild <moonchild@palemoon.org>2020-07-30 09:37:13 +0000
committerMoonchild <moonchild@palemoon.org>2020-07-30 09:37:13 +0000
commit2ed0607c747b21cadaf7401d4ba706097578e74d (patch)
tree6b5016adc70709a73b31a922b2319c56eb28fa55
parent16d131310403987af82388ea6e550ccc3e7dd9a0 (diff)
parent922a72766caa4a833f5775b17e4729ae5f79260d (diff)
downloadUXP-2ed0607c747b21cadaf7401d4ba706097578e74d.tar
UXP-2ed0607c747b21cadaf7401d4ba706097578e74d.tar.gz
UXP-2ed0607c747b21cadaf7401d4ba706097578e74d.tar.lz
UXP-2ed0607c747b21cadaf7401d4ba706097578e74d.tar.xz
UXP-2ed0607c747b21cadaf7401d4ba706097578e74d.zip
Merge branch 'redwood' into releaseRELBASE_20200730
-rw-r--r--ldap/c-sdk/common.mozbuild2
-rw-r--r--ldap/c-sdk/include/portable.h4
-rw-r--r--ldap/c-sdk/libldap/tmplout.c7
3 files changed, 5 insertions, 8 deletions
diff --git a/ldap/c-sdk/common.mozbuild b/ldap/c-sdk/common.mozbuild
index 4377982c5..e335f230a 100644
--- a/ldap/c-sdk/common.mozbuild
+++ b/ldap/c-sdk/common.mozbuild
@@ -17,6 +17,8 @@ elif CONFIG['OS_TARGET'] in ('OpenBSD', 'FreeBSD', 'NetBSD'):
DEFINES[CONFIG['OS_TARGET'].upper()] = True
elif CONFIG['OS_ARCH'] == 'WINNT':
DEFINES['_WINDOWS'] = True
+elif CONFIG['OS_ARCH'] == 'SunOS':
+ DEFINES['__USE_DRAFT6_PROTOTYPES__'] = True
DEFINES['_PR_PTHREADS'] = True
DEFINES['NET_SSL'] = True
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
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,