diff options
author | Moonchild <moonchild@palemoon.org> | 2020-07-30 09:37:13 +0000 |
---|---|---|
committer | Moonchild <moonchild@palemoon.org> | 2020-07-30 09:37:13 +0000 |
commit | 2ed0607c747b21cadaf7401d4ba706097578e74d (patch) | |
tree | 6b5016adc70709a73b31a922b2319c56eb28fa55 /ldap/c-sdk/include | |
parent | 16d131310403987af82388ea6e550ccc3e7dd9a0 (diff) | |
parent | 922a72766caa4a833f5775b17e4729ae5f79260d (diff) | |
download | UXP-2ed0607c747b21cadaf7401d4ba706097578e74d.tar UXP-2ed0607c747b21cadaf7401d4ba706097578e74d.tar.gz UXP-2ed0607c747b21cadaf7401d4ba706097578e74d.tar.lz UXP-2ed0607c747b21cadaf7401d4ba706097578e74d.tar.xz UXP-2ed0607c747b21cadaf7401d4ba706097578e74d.zip |
Merge branch 'redwood' into releaseRELBASE_20200730
Diffstat (limited to 'ldap/c-sdk/include')
-rw-r--r-- | ldap/c-sdk/include/portable.h | 4 |
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 |