diff options
| author | Petr Mladek <pmladek@suse.cz> | 2011-03-30 17:34:26 +0200 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2011-03-30 17:35:12 +0200 |
| commit | f62ec4cda204534354e51d920d21231ddbfe8ba3 (patch) | |
| tree | 6de5932c8b59488821363a13b503ae990a52d1b2 | |
| parent | e9cf691797683e84df47d4ee71281594ad6eb298 (diff) | |
ucb-neon-0.24.diff: fix build with neon-0.24
| -rwxr-xr-x[-rw-r--r--] | ucb/source/ucp/webdav/NeonSession.cxx | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/ucb/source/ucp/webdav/NeonSession.cxx b/ucb/source/ucp/webdav/NeonSession.cxx index 3326dd1c32..ae54ff4386 100644..100755 --- a/ucb/source/ucp/webdav/NeonSession.cxx +++ b/ucb/source/ucp/webdav/NeonSession.cxx @@ -39,7 +39,16 @@ #include <ne_auth.h> #include <ne_redirect.h> #include <ne_ssl.h> + +#if NEON_VERSION < 0x0260 +// old neon versions forgot to set this +extern "C" { +#endif #include <ne_compress.h> +#if NEON_VERSION < 0x0260 +} +#endif + #include "libxml/parser.h" #include "rtl/ustrbuf.hxx" #include "comphelper/sequence.hxx" @@ -805,10 +814,13 @@ void NeonSession::Init() ne_redirect_register( m_pHttpSession ); // authentication callbacks. - ne_add_server_auth( - m_pHttpSession, NE_AUTH_ALL, NeonSession_NeonAuth, this ); - ne_add_proxy_auth( - m_pHttpSession, NE_AUTH_ALL, NeonSession_NeonAuth, this ); +#if NEON_VERSION >= 0x0260 + ne_add_server_auth( m_pHttpSession, NE_AUTH_ALL, NeonSession_NeonAuth, this ); + ne_add_proxy_auth ( m_pHttpSession, NE_AUTH_ALL, NeonSession_NeonAuth, this ); +#else + ne_set_server_auth( m_pHttpSession, NeonSession_NeonAuth, this ); + ne_set_proxy_auth ( m_pHttpSession, NeonSession_NeonAuth, this ); +#endif } } |