incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From h..@apache.org
Subject svn commit: r1296126 - /incubator/ooo/trunk/main/curl/curl-7.19.7.patch
Date Fri, 02 Mar 2012 10:46:26 GMT
Author: hdu
Date: Fri Mar  2 10:46:26 2012
New Revision: 1296126

URL: http://svn.apache.org/viewvc?rev=1296126&view=rev
Log:
prevent curl build problem with newer libssh2.h

Modified:
    incubator/ooo/trunk/main/curl/curl-7.19.7.patch

Modified: incubator/ooo/trunk/main/curl/curl-7.19.7.patch
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/curl/curl-7.19.7.patch?rev=1296126&r1=1296125&r2=1296126&view=diff
==============================================================================
--- incubator/ooo/trunk/main/curl/curl-7.19.7.patch (original)
+++ incubator/ooo/trunk/main/curl/curl-7.19.7.patch Fri Mar  2 10:46:26 2012
@@ -81,3 +81,23 @@
  	  ;;
  
  	irix | nonstopux)
+--- misc/curl-7.19.7/lib/ssh.c	2009-10-30 23:28:56 +0100
++++ misc/build/curl-7.19.7/lib/ssh.c	2009-10-31 11:33:05 +0100
+@@ -119,7 +119,7 @@
+ static const char *sftp_libssh2_strerror(unsigned long err);
+ static LIBSSH2_ALLOC_FUNC(libssh2_malloc);
+ static LIBSSH2_REALLOC_FUNC(libssh2_realloc);
+-static LIBSSH2_FREE_FUNC(libssh2_free);
++static LIBSSH2_FREE_FUNC(my_libssh2_free);
+ 
+ static CURLcode get_pathname(const char **cpp, char **path);
+ 
+@@ -286,7 +286,7 @@
+   return realloc(ptr, count);
+ }
+ 
+-static LIBSSH2_FREE_FUNC(libssh2_free)
++static LIBSSH2_FREE_FUNC(my_libssh2_free)
+ {
+   (void)abstract; /* arg not used */
+   free(ptr);



Mime
View raw message