[Libreoffice-commits] .: ucb/source

Petr Mladek pmladek at kemper.freedesktop.org
Wed Mar 30 08:35:35 PDT 2011


 ucb/source/ucp/webdav/NeonSession.cxx |   20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

New commits:
commit f62ec4cda204534354e51d920d21231ddbfe8ba3
Author: Petr Mladek <pmladek at suse.cz>
Date:   Wed Mar 30 17:34:26 2011 +0200

    ucb-neon-0.24.diff: fix build with neon-0.24

diff --git a/ucb/source/ucp/webdav/NeonSession.cxx b/ucb/source/ucp/webdav/NeonSession.cxx
old mode 100644
new mode 100755
index 3326dd1..ae54ff4
--- 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
     }
 }
 


More information about the Libreoffice-commits mailing list