diff options
| author | sb <sb@openoffice.org> | 2009-10-21 16:53:02 +0200 |
|---|---|---|
| committer | sb <sb@openoffice.org> | 2009-10-21 16:53:02 +0200 |
| commit | 3dc9a13b6d27b73ac7d26ae14ab171c022062e65 (patch) | |
| tree | 1ebd2e06a5eeb91805840c0aa1e56b0601fd3670 /extensions/source/config/ldap | |
| parent | 2df020e247a9dbaaf83009272f9d5e16764f5c73 (diff) | |
| parent | dca5cf3fdaaed8be10e8ca32fa8d7b4e0647e17b (diff) | |
merged in DEV300_m62
Diffstat (limited to 'extensions/source/config/ldap')
| -rw-r--r-- | extensions/source/config/ldap/ldapaccess.cxx | 15 | ||||
| -rw-r--r-- | extensions/source/config/ldap/wrapldapinclude.hxx | 6 |
2 files changed, 15 insertions, 6 deletions
diff --git a/extensions/source/config/ldap/ldapaccess.cxx b/extensions/source/config/ldap/ldapaccess.cxx index 7d67871b2f01..f55a42294dae 100644 --- a/extensions/source/config/ldap/ldapaccess.cxx +++ b/extensions/source/config/ldap/ldapaccess.cxx @@ -283,14 +283,17 @@ void LdapConnection::loadModule() if ( !s_Ldap_Module ) { #if defined(WIN) || defined(WNT) - const ::rtl::OUString sModuleName(RTL_CONSTASCII_USTRINGPARAM("nsldap32v50.dll")); +# define LIBLDAP "nsldap32v50.dll" #else -#ifdef WITH_OPENLDAP - const ::rtl::OUString sModuleName(RTL_CONSTASCII_USTRINGPARAM("libldap.so")); -#else - const ::rtl::OUString sModuleName(RTL_CONSTASCII_USTRINGPARAM("libldap50.so")); -#endif +# ifdef WITH_OPENLDAP +# define xstr(s) str(s) +# define str(s) #s +# define LIBLDAP "libldap-" xstr(LDAP_VENDOR_VERSION_MAJOR) "." xstr(LDAP_VENDOR_VERSION_MINOR) ".so." xstr(LDAP_VENDOR_VERSION_MAJOR) +# else +# define LIBLDAP "libldap50.so" +# endif #endif + const ::rtl::OUString sModuleName(RTL_CONSTASCII_USTRINGPARAM(LIBLDAP)); // load the dbtools library s_Ldap_Module = osl_loadModuleRelative(&thisModule, sModuleName.pData, 0); diff --git a/extensions/source/config/ldap/wrapldapinclude.hxx b/extensions/source/config/ldap/wrapldapinclude.hxx index 4c1bbdc350f8..b3b8d45e94d7 100644 --- a/extensions/source/config/ldap/wrapldapinclude.hxx +++ b/extensions/source/config/ldap/wrapldapinclude.hxx @@ -35,6 +35,12 @@ #ifdef WITH_OPENLDAP #include <ldap.h> +#ifndef LDAP_API +# define LDAP_API(rt) rt +#endif +#ifndef LDAP_CALL +# define LDAP_CALL +#endif #else #ifndef LDAP_INCLUDED #define LDAP_INCLUDED |