diff --git a/harbour/ChangeLog b/harbour/ChangeLog index a8b12f918a..73f11cfb08 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,16 @@ 2008-12-31 13:59 UTC+0100 Foo Bar */ +2008-06-02 12:00 UTC+0100 Viktor Szakats (harbour.01 syenar hu) + * source/common/hbverdsp.c + ! Minor correction. + * Wording/layout. C++/C and ANSI C init mode is now in + one line as "Other build settings". + + * contrib/hbcurl/hbcurl.c + + Comment extended regarding libcurl version requirement. + + Added version guard (not currently effective). + 2008-06-02 11:34 UTC+0100 Viktor Szakats (harbour.01 syenar hu) * source/vm/extrap.c ! Blind fix for OS/2. diff --git a/harbour/contrib/hbcurl/hbcurl.c b/harbour/contrib/hbcurl/hbcurl.c index e1f1085ec2..14da535371 100644 --- a/harbour/contrib/hbcurl/hbcurl.c +++ b/harbour/contrib/hbcurl/hbcurl.c @@ -52,7 +52,10 @@ * */ -/* NOTE: Harbour requires libcurl 7.17.0 or upper. */ +/* NOTE: Harbour requires libcurl 7.17.0 or upper. + This was the version where curl_easy_setopt() started to + make copies of passed strings, which we currently require. + [vszakats] */ #include "curl/curl.h" #include "curl/types.h" @@ -82,6 +85,10 @@ #define LIBCURL_VERSION_NUM 0x071801 #endif +#if LIBCURL_VERSION_NUM < 0x071700 + #error hbcurl: we need libcurl 7.17.0 or upper. +#endif + typedef struct _HB_CURL { CURL * curl; diff --git a/harbour/source/common/hbverdsp.c b/harbour/source/common/hbverdsp.c index 04a85da050..e61bb9c119 100644 --- a/harbour/source/common/hbverdsp.c +++ b/harbour/source/common/hbverdsp.c @@ -150,6 +150,17 @@ void hb_verBuildInfo( void ) } } + hb_conOutErr( "Other build settings: ", 0 ); +#if defined(__cplusplus) + hb_conOutErr( "(C++ mode)", 0 ); +#else + hb_conOutErr( "(C mode)", 0 ); +#endif +#if defined( HB_STRICT_ANSI_C ) + hb_conOutErr( "(ANSI C symbol initialization)", 0 ); +#endif + hb_conOutErr( hb_conNewLine(), 0 ); + hb_conOutErr( hb_conNewLine(), 0 ); hb_conOutErr( "CA-Clipper 5.3b compatible extensions: ", 0 ); @@ -224,7 +235,7 @@ void hb_verBuildInfo( void ) #endif hb_conOutErr( hb_conNewLine(), 0 ); - hb_conOutErr( "Harbour non-portable extensions: ", 0 ); + hb_conOutErr( "Non-portable Harbour extensions: ", 0 ); #if defined( HB_EXTENSION ) hb_conOutErr( "yes", 0 ); #else @@ -232,22 +243,6 @@ void hb_verBuildInfo( void ) #endif hb_conOutErr( hb_conNewLine(), 0 ); - hb_conOutErr( "ANSI C usage: ", 0 ); -#if defined( HARBOUR_STRICT_ANSI_C ) - hb_conOutErr( "strict", 0 ); -#else - hb_conOutErr( "non strict", 0 ); -#endif - hb_conOutErr( hb_conNewLine(), 0 ); - - hb_conOutErr( "C++ mode: ", 0 ); -#if defined(__cplusplus) - hb_conOutErr( "on", 0 ); -#else - hb_conOutErr( "off", 0 ); -#endif - hb_conOutErr( hb_conNewLine(), 0 ); - hb_conOutErr( "Profiler: ", 0 ); #if defined( HB_NO_PROFILER ) hb_conOutErr( "off", 0 );