From 5afcd6feae1df4853ff077a4cacaac66bcb99511 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Wed, 5 Nov 2008 18:28:27 +0000 Subject: [PATCH] 2008-11-05 19:26 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * contrib/hbcurl/hbcurl.c % Removed two Harbour level functions not really adding to functionality but forcing linkage of these (otherwise unused) curl interfaces. CURL_SHARE_STRERROR() CURL_MULTI_STRERROR() INCOMPATIBLE (but I doubt even a single user would be affected) * source/rtl/version.c ! Fix to prev. --- harbour/ChangeLog | 12 ++++++++++++ harbour/contrib/hbcurl/hbcurl.c | 4 ++++ harbour/source/rtl/version.c | 2 +- 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index f770b5b87e..5da70b01e8 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,18 @@ 2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2008-11-05 19:26 UTC+0200 Viktor Szakats (harbour.01 syenar hu) + * contrib/hbcurl/hbcurl.c + % Removed two Harbour level functions not really + adding to functionality but forcing linkage of these + (otherwise unused) curl interfaces. + CURL_SHARE_STRERROR() + CURL_MULTI_STRERROR() + INCOMPATIBLE (but I doubt even a single user would be affected) + + * source/rtl/version.c + ! Fix to prev. + 2008-11-05 19:16 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * bin/hb-func.sh * include/hbstdgen.ch diff --git a/harbour/contrib/hbcurl/hbcurl.c b/harbour/contrib/hbcurl/hbcurl.c index 9a34e3b09f..ab45da644f 100644 --- a/harbour/contrib/hbcurl/hbcurl.c +++ b/harbour/contrib/hbcurl/hbcurl.c @@ -55,7 +55,9 @@ #include "curl/curl.h" #include "curl/types.h" #include "curl/easy.h" +#if 0 #include "curl/multi.h" +#endif #include "hbapi.h" #include "hbapiitm.h" @@ -1832,6 +1834,7 @@ HB_FUNC( CURL_EASY_STRERROR ) hb_errRT_BASE( EG_ARG, 2010, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } +#if 0 HB_FUNC( CURL_SHARE_STRERROR ) { if( ISNUM( 1 ) ) @@ -1847,6 +1850,7 @@ HB_FUNC( CURL_MULTI_STRERROR ) else hb_errRT_BASE( EG_ARG, 2010, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } +#endif #endif diff --git a/harbour/source/rtl/version.c b/harbour/source/rtl/version.c index fa88c80778..dea4066f91 100644 --- a/harbour/source/rtl/version.c +++ b/harbour/source/rtl/version.c @@ -73,7 +73,7 @@ HB_FUNC( HB_VERSION ) case HB_VERSION_COMPILER: hb_retc_buffer( hb_verCompiler() ); break; case HB_VERSION_MAJOR: hb_retni( HB_VER_MAJOR ); break; case HB_VERSION_MINOR: hb_retni( HB_VER_MINOR ); break; - case HB_VERSION_RELEASE: hb_retni( HB_VER_REVISION ); break; + case HB_VERSION_RELEASE: hb_retni( HB_VER_RELEASE ); break; case HB_VERSION_STATUS: hb_retc( HB_VER_STATUS ); break; case HB_VERSION_REVISION: hb_retni( hb_verSvnID() ); break; case HB_VERSION_BUILD_DATE_STR: hb_retc_buffer( hb_verBuildDate() ); break;