ooo-build r11620 - in trunk: . patches/src680

[jholesovsky svn gnome org]

Author: jholesovsky
Date: Mon Feb 18 16:49:43 2008
New Revision: 11620
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11620&view=rev

Log:
2008-02-18  Jan Holesovsky  <kendy suse cz>

        * patches/src680/webdav-locking.diff,
          patches/src680/webdav-locking-neon24.diff: Update according to
          cmcfixes42.


Modified:
   trunk/ChangeLog
   trunk/patches/src680/webdav-locking-neon24.diff
   trunk/patches/src680/webdav-locking.diff

Modified: trunk/patches/src680/webdav-locking-neon24.diff
==============================================================================
--- trunk/patches/src680/webdav-locking-neon24.diff	(original)
+++ trunk/patches/src680/webdav-locking-neon24.diff	Mon Feb 18 16:49:43 2008
@@ -5,7 +5,7 @@
      ne_uri_parse( rtl::OUStringToOString( m_aEnv.m_aRequestURI, RTL_TEXTENCODING_UTF8 ).getStr(),
              &aUri );
 +    
-+#if NEON_VERSION < 0260
++#if NEON_VERSION < 0x0260
 +#define FILLIN( field, val ) aUri.field = aUri.field? aUri.field: strdup( rtl::OUStringToOString( val, RTL_TEXTENCODING_UTF8 ).getStr() )
 +    FILLIN( scheme, m_aScheme );
 +    FILLIN( host, m_aHostName );

Modified: trunk/patches/src680/webdav-locking.diff
==============================================================================
--- trunk/patches/src680/webdav-locking.diff	(original)
+++ trunk/patches/src680/webdav-locking.diff	Mon Feb 18 16:49:43 2008
@@ -794,7 +794,7 @@
 @@ -253,12 +256,13 @@ struct NeonRequestContext
  // -------------------------------------------------------------------
  
- #if NEON_VERSION >= 0250
+ #if NEON_VERSION >= 0x0250
 -extern "C" int NeonSession_ResponseBlockReader(void * inUserData, 
 +extern "C" int
  #else
@@ -812,7 +812,7 @@
 @@ -283,12 +287,13 @@ extern "C" void NeonSession_ResponseBlockReader(void * inUserData,
  // -------------------------------------------------------------------
  
- #if NEON_VERSION >= 0250
+ #if NEON_VERSION >= 0x0250
 -extern "C" int NeonSession_ResponseBlockWriter( void * inUserData, 
 +extern "C" int
  #else