From 955ef120a4f4b9cf7c1c7f6b60f92c11225a1a8e Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Mon, 2 Jun 2008 17:02:46 +0000 Subject: [PATCH] 2008-06-02 18:59 UTC+0100 Viktor Szakats (harbour.01 syenar hu) * contrib/xhb/hbcompat.ch ! Minor fix in hb to xhb branch. * contrib/hbcurl/hbcurl.ch * '( 2 ** n )' expressions changed to actual values. ; We now have these optimized, but I'm committing anyway, as some folks may be scared away by seeing these, and not knowing it's optimized (and they might not even be optimized on some Clipper platforms...). * contrib/mtpl_vc.mak ! Fixed HB_VISUALC_VER to default to '60' rather than crashing. Same default is used for core make files already. * source/common/hbverdsp.c - Removed 'CA'. + Added word 'compatible' to the 'undocumented' line. --- harbour/ChangeLog | 22 +++++++++++++++++++++- harbour/contrib/hbcurl/hbcurl.ch | 24 ++++++++++++------------ harbour/contrib/mtpl_vc.mak | 5 +++++ harbour/contrib/xhb/hbcompat.ch | 8 ++++---- harbour/source/common/hbverdsp.c | 8 ++++---- 5 files changed, 46 insertions(+), 21 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index f590f99aa7..c8945a7450 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,9 +8,29 @@ 2008-12-31 13:59 UTC+0100 Foo Bar */ +2008-06-02 18:59 UTC+0100 Viktor Szakats (harbour.01 syenar hu) + * contrib/xhb/hbcompat.ch + ! Minor fix in hb to xhb branch. + + * contrib/hbcurl/hbcurl.ch + * '( 2 ** n )' expressions changed to actual values. + ; We now have these optimized, but I'm committing anyway, + as some folks may be scared away by seeing these, and + not knowing it's optimized (and they might not even be + optimized on some Clipper platforms...). + + * contrib/mtpl_vc.mak + ! Fixed HB_VISUALC_VER to default to '60' rather than + crashing. Same default is used for core make files + already. + + * source/common/hbverdsp.c + - Removed 'CA'. + + Added word 'compatible' to the 'undocumented' line. + 2008-06-02 16:46 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/include/hbexprb.c - ! do not optimize HB_BIAND(), HB_BITOR() and HB_BITXOR() when only + ! do not optimize HB_BITAND(), HB_BITOR() and HB_BITXOR() when only one parameter is passed to keep RT error compatibility * use hb_compExprListStrip() to optimize function calls also when parameters are passed in parenthesis, f.e.: diff --git a/harbour/contrib/hbcurl/hbcurl.ch b/harbour/contrib/hbcurl/hbcurl.ch index 777c0651b3..bcde9d6542 100644 --- a/harbour/contrib/hbcurl/hbcurl.ch +++ b/harbour/contrib/hbcurl/hbcurl.ch @@ -240,10 +240,10 @@ /* HB_CURLOPT_HTTPAUTH option */ #define HB_CURLAUTH_NONE 0 /* nothing */ -#define HB_CURLAUTH_BASIC ( 2 ** 0 ) /* Basic (default) */ -#define HB_CURLAUTH_DIGEST ( 2 ** 1 ) /* Digest */ -#define HB_CURLAUTH_GSSNEGOTIATE ( 2 ** 2 ) /* GSS-Negotiate */ -#define HB_CURLAUTH_NTLM ( 2 ** 3 ) /* NTLM */ +#define HB_CURLAUTH_BASIC 1 /* Basic (default) */ +#define HB_CURLAUTH_DIGEST 2 /* Digest */ +#define HB_CURLAUTH_GSSNEGOTIATE 4 /* GSS-Negotiate */ +#define HB_CURLAUTH_NTLM 8 /* NTLM */ #define HB_CURLAUTH_ANY hb_BitNot( 0 ) /* all types set */ #define HB_CURLAUTH_ANYSAFE hb_BitNot( HB_CURLAUTH_BASIC ) @@ -294,23 +294,23 @@ /* HB_CURLOPT_SSH_AUTH_TYPES option */ #define HB_CURL_CURLSSH_AUTH_ANY hb_BitNot( 0 ) /* all types supported by the server */ #define HB_CURL_CURLSSH_AUTH_NONE 0 /* none allowed, silly but complete */ -#define HB_CURL_CURLSSH_AUTH_PUBLICKEY ( 2 ** 0 ) /* public/private key files */ -#define HB_CURL_CURLSSH_AUTH_PASSWORD ( 2 ** 1 ) /* password */ -#define HB_CURL_CURLSSH_AUTH_HOST ( 2 ** 2 ) /* host key files */ -#define HB_CURL_CURLSSH_AUTH_KEYBOARD ( 2 ** 3 ) /* keyboard interactive */ +#define HB_CURL_CURLSSH_AUTH_PUBLICKEY 1 /* public/private key files */ +#define HB_CURL_CURLSSH_AUTH_PASSWORD 2 /* password */ +#define HB_CURL_CURLSSH_AUTH_HOST 4 /* host key files */ +#define HB_CURL_CURLSSH_AUTH_KEYBOARD 8 /* keyboard interactive */ #define HB_CURL_CURLSSH_AUTH_DEFAULT HB_CURLSSH_AUTH_ANY /* curl_easy_pause() parameters. They can be combined with hb_BitOr(). */ -#define HB_CURLPAUSE_RECV ( 2 ** 0 ) +#define HB_CURLPAUSE_RECV 1 #define HB_CURLPAUSE_RECV_CONT 0 -#define HB_CURLPAUSE_SEND ( 2 ** 2 ) +#define HB_CURLPAUSE_SEND 4 #define HB_CURLPAUSE_SEND_CONT 0 #define HB_CURLPAUSE_ALL hb_BitOr( HB_CURLPAUSE_RECV, HB_CURLPAUSE_SEND ) #define HB_CURLPAUSE_CONT hb_BitOr( HB_CURLPAUSE_RECV_CONT, HB_CURLPAUSE_SEND_CONT ) /* curl_global_init() parameters. */ -#define HB_CURL_GLOBAL_SSL ( 2 ** 0 ) -#define HB_CURL_GLOBAL_WIN32 ( 2 ** 1 ) +#define HB_CURL_GLOBAL_SSL 1 +#define HB_CURL_GLOBAL_WIN32 2 #define HB_CURL_GLOBAL_ALL hb_BitOr( HB_CURL_GLOBAL_SSL, HB_CURL_GLOBAL_WIN32 ) #define HB_CURL_GLOBAL_NOTHING 0 #define HB_CURL_GLOBAL_DEFAULT HB_CURL_GLOBAL_ALL diff --git a/harbour/contrib/mtpl_vc.mak b/harbour/contrib/mtpl_vc.mak index 1e87dc1e65..78794dfaff 100644 --- a/harbour/contrib/mtpl_vc.mak +++ b/harbour/contrib/mtpl_vc.mak @@ -109,6 +109,11 @@ HB_BUILD_MODE = C #********************************************************** +# Visual C++ version +!ifndef HB_VISUALC_VER +HB_VISUALC_VER = 60 +!endif + # C Compiler Flags !if $(HB_VISUALC_VER) >= 80 CFLAGS_VER = -Ot2b1 -FD -Gs -D_CRT_SECURE_NO_DEPRECATE diff --git a/harbour/contrib/xhb/hbcompat.ch b/harbour/contrib/xhb/hbcompat.ch index ce0fb56b18..5d125ba027 100644 --- a/harbour/contrib/xhb/hbcompat.ch +++ b/harbour/contrib/xhb/hbcompat.ch @@ -61,10 +61,10 @@ #xtranslate hb_gtInfo([]) => gtInfo() #xtranslate hb_gtVersion([]) => hb_gt_Version() - #xtranslate hb_ScrMaxRow() => hb_gtInfo( HB_GTI_SCREENHEIGHT ) - #xtranslate hb_ScrMaxCol() => hb_gtInfo( HB_GTI_SCREENWIDTH ) - #xtranslate MaxRow(.T.) => hb_gtInfo( HB_GTI_SCREENHEIGHT ) - #xtranslate MaxCol(.T.) => hb_gtInfo( HB_GTI_SCREENWIDTH ) + #xtranslate hb_ScrMaxRow() => gtInfo( HB_GTI_SCREENHEIGHT ) + #xtranslate hb_ScrMaxCol() => gtInfo( HB_GTI_SCREENWIDTH ) + #xtranslate MaxRow(.T.) => gtInfo( HB_GTI_SCREENHEIGHT ) + #xtranslate MaxCol(.T.) => gtInfo( HB_GTI_SCREENWIDTH ) #xtranslate hb_dbPack() => __dbPack() #xtranslate hb_dbZap() => __dbZap() diff --git a/harbour/source/common/hbverdsp.c b/harbour/source/common/hbverdsp.c index e61bb9c119..e7829d9178 100644 --- a/harbour/source/common/hbverdsp.c +++ b/harbour/source/common/hbverdsp.c @@ -163,7 +163,7 @@ void hb_verBuildInfo( void ) hb_conOutErr( hb_conNewLine(), 0 ); - hb_conOutErr( "CA-Clipper 5.3b compatible extensions: ", 0 ); + hb_conOutErr( "Clipper 5.3b compatible extensions: ", 0 ); #if defined( HB_COMPAT_C53 ) hb_conOutErr( "yes", 0 ); #else @@ -171,7 +171,7 @@ void hb_verBuildInfo( void ) #endif hb_conOutErr( hb_conNewLine(), 0 ); - hb_conOutErr( "CA-Clipper 5.2e/5.3b undocumented: ", 0 ); + hb_conOutErr( "Clipper 5.2e/5.3b compatible undocumented: ", 0 ); #if defined( HB_C52_UNDOC ) hb_conOutErr( "yes", 0 ); #else @@ -179,7 +179,7 @@ void hb_verBuildInfo( void ) #endif hb_conOutErr( hb_conNewLine(), 0 ); - hb_conOutErr( "CA-Clipper 5.2e/5.3b strict compatibility: ", 0 ); + hb_conOutErr( "Clipper 5.2e/5.3b strict compatibility: ", 0 ); #if defined( HB_C52_STRICT ) hb_conOutErr( "yes", 0 ); #else @@ -203,7 +203,7 @@ void hb_verBuildInfo( void ) #endif hb_conOutErr( hb_conNewLine(), 0 ); - hb_conOutErr( "CA-Visual Objects compatible extensions: ", 0 ); + hb_conOutErr( "Visual Objects compatible extensions: ", 0 ); #if defined( HB_COMPAT_VO ) hb_conOutErr( "yes", 0 ); #else