Kaydet (Commit) 4f182120 authored tarafından Cédric Bosdonnat's avatar Cédric Bosdonnat

Oops, fix a bad fix in libcmis for libcurl version checks

Change-Id: I56b5bcd459c79de5be079d0c6563148e17f0bc9b
üst 1ca20c89
diff -ur misc/build/libcmis-0.2.2.old/src/libcmis/atom-session.cxx misc/build/libcmis-0.2.2/src/libcmis/atom-session.cxx
--- misc/build/libcmis-0.2.2.old/src/libcmis/atom-session.cxx 2012-06-04 20:35:46.400203393 +0200
+++ misc/build/libcmis-0.2.2/src/libcmis/atom-session.cxx 2012-06-04 20:36:16.255205010 +0200
@@ -382,7 +382,7 @@
if ( pos != string::npos )
{
// Escape the URL by chunks
-#if LIBCURL_VERSION_VALUE >= 71504
+#if LIBCURL_VERSION_VALUE >= 0x071504
char* escaped = curl_easy_escape( m_curlHandle, value.c_str(), value.length() );
#else
char* escaped = curl_escape( value.c_str(), value.length() );
@@ -550,7 +550,7 @@
{
curl_easy_setopt( m_curlHandle, CURLOPT_HTTPAUTH, CURLAUTH_ANY );
-#if LIBCURL_VERSION_VALUE >= 71901
+#if LIBCURL_VERSION_VALUE >= 0x071901
curl_easy_setopt( m_curlHandle, CURLOPT_USERNAME, m_username.c_str() );
curl_easy_setopt( m_curlHandle, CURLOPT_PASSWORD, m_password.c_str() );
#else
...@@ -44,6 +44,9 @@ TARGET=cmis ...@@ -44,6 +44,9 @@ TARGET=cmis
TARFILE_NAME=libcmis-0.2.2 TARFILE_NAME=libcmis-0.2.2
TARFILE_MD5=ce31ac7b92cb5e66459f67213bbb6168 TARFILE_MD5=ce31ac7b92cb5e66459f67213bbb6168
# Fixed for 0.2.3
PATCH_FILES+=libcurl-version-fix.patch
.IF "$(OS)$(COM)" == "WNTMSC" .IF "$(OS)$(COM)" == "WNTMSC"
PATCH_FILES+=boost-win.patch PATCH_FILES+=boost-win.patch
.ENDIF .ENDIF
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment