From 92dddad5e8d1bb39ecbca6610bdc12b6378192bb Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Thu, 18 Oct 2012 21:59:19 +0000 Subject: [PATCH] 2012-10-18 23:52 UTC+0200 Viktor Szakats (harbour syenar.net) * contrib/gtwvg/wvgutils.c * contrib/hbct/dbftools.c * contrib/hbfship/flddeci.c * contrib/hbfship/isfunc.c * contrib/hbfship/secondfs.c * contrib/hbnf/mouse.c * contrib/hbxpp/dbcmdx.c * contrib/hbxpp/dbdetacx.c * contrib/hbxpp/dllx.c * contrib/rddsql/sqlmix.c * contrib/sddfb/sddfb.c * contrib/sddmy/sddmy.c * contrib/sddoci/sddoci.c * contrib/sddodbc/sddodbc.c * contrib/sddpg/sddpg.c * contrib/sddsqlt3/sddsqlt3.c * contrib/xhb/xhbarr.c * contrib/xhb/xhbdate.c * contrib/xhb/xhbfs.c * contrib/xhb/xhbfunc.c * contrib/xhb/xhbgt.c * contrib/xhb/xhbhash.c * contrib/xhb/xhbi18n.c * contrib/xhb/xhbinet.c * contrib/xhb/xhbini.c * contrib/xhb/xhbmtc.c * contrib/xhb/xhbolec.c * contrib/xhb/xhbprn.c * contrib/xhb/xhbproc.c * contrib/xhb/xhbregx.c * contrib/xhb/xhbwin.c * contrib/xhb/xwin_reg.c * contrib/xhb/xwin_ver.c * src/rdd/dbcmdhb.c * src/rdd/dbdrop.c * src/rdd/dbexists.c * src/rdd/dbnubs.c * src/rdd/dbrename.c * src/rdd/fieldhb.c * src/rdd/hbsix/sxredir.c * src/rdd/hsx/cftsfunc.c * src/rdd/rddinfo.c * src/rtl/cdpapihb.c * src/rtl/defpathu.c * src/rtl/errapiu.c * src/rtl/natmsgu.c * src/rtl/pad.c * src/rtl/shadowu.c * src/vm/memvclip.c * use HB_FUNC_TRANSLATE() when creating pure forwarder stubs (I might rename this to HB_FUNC_FORWARD()) --- harbour/ChangeLog | 53 +++++++++ harbour/contrib/gtwvg/wvgutils.c | 8 +- harbour/contrib/hbct/dbftools.c | 21 +--- harbour/contrib/hbfship/flddeci.c | 7 +- harbour/contrib/hbfship/isfunc.c | 7 +- harbour/contrib/hbfship/secondfs.c | 7 +- harbour/contrib/hbnf/mouse.c | 2 + harbour/contrib/hbxpp/dbcmdx.c | 26 +---- harbour/contrib/hbxpp/dbdetacx.c | 15 +-- harbour/contrib/hbxpp/dllx.c | 20 +--- harbour/contrib/rddsql/sqlmix.c | 7 +- harbour/contrib/sddfb/sddfb.c | 2 +- harbour/contrib/sddmy/sddmy.c | 2 +- harbour/contrib/sddoci/sddoci.c | 2 +- harbour/contrib/sddodbc/sddodbc.c | 2 +- harbour/contrib/sddpg/sddpg.c | 2 +- harbour/contrib/sddsqlt3/sddsqlt3.c | 2 +- harbour/contrib/xhb/xhbarr.c | 7 +- harbour/contrib/xhb/xhbdate.c | 14 +-- harbour/contrib/xhb/xhbfs.c | 8 +- harbour/contrib/xhb/xhbfunc.c | 75 ++++--------- harbour/contrib/xhb/xhbgt.c | 10 +- harbour/contrib/xhb/xhbhash.c | 52 ++++----- harbour/contrib/xhb/xhbi18n.c | 2 +- harbour/contrib/xhb/xhbinet.c | 81 +++++++------- harbour/contrib/xhb/xhbini.c | 6 +- harbour/contrib/xhb/xhbmtc.c | 20 ++-- harbour/contrib/xhb/xhbolec.c | 29 ++--- harbour/contrib/xhb/xhbprn.c | 14 +-- harbour/contrib/xhb/xhbproc.c | 4 +- harbour/contrib/xhb/xhbregx.c | 2 +- harbour/contrib/xhb/xhbwin.c | 34 ++---- harbour/contrib/xhb/xwin_reg.c | 6 +- harbour/contrib/xhb/xwin_ver.c | 40 +++---- harbour/src/rdd/dbcmdhb.c | 15 +-- harbour/src/rdd/dbdrop.c | 7 +- harbour/src/rdd/dbexists.c | 7 +- harbour/src/rdd/dbnubs.c | 168 ++++------------------------ harbour/src/rdd/dbrename.c | 7 +- harbour/src/rdd/fieldhb.c | 23 +--- harbour/src/rdd/hbsix/sxredir.c | 25 +---- harbour/src/rdd/hsx/cftsfunc.c | 91 +++------------ harbour/src/rdd/rddinfo.c | 7 +- harbour/src/rtl/cdpapihb.c | 7 +- harbour/src/rtl/defpathu.c | 7 +- harbour/src/rtl/errapiu.c | 13 +-- harbour/src/rtl/natmsgu.c | 47 ++------ harbour/src/rtl/pad.c | 7 +- harbour/src/rtl/shadowu.c | 7 +- harbour/src/vm/memvclip.c | 38 ++----- 50 files changed, 322 insertions(+), 743 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index d6afed8a69..6842d2a817 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,59 @@ The license applies to all entries newer than 2009-04-28. */ +2012-10-18 23:52 UTC+0200 Viktor Szakats (harbour syenar.net) + * contrib/gtwvg/wvgutils.c + * contrib/hbct/dbftools.c + * contrib/hbfship/flddeci.c + * contrib/hbfship/isfunc.c + * contrib/hbfship/secondfs.c + * contrib/hbnf/mouse.c + * contrib/hbxpp/dbcmdx.c + * contrib/hbxpp/dbdetacx.c + * contrib/hbxpp/dllx.c + * contrib/rddsql/sqlmix.c + * contrib/sddfb/sddfb.c + * contrib/sddmy/sddmy.c + * contrib/sddoci/sddoci.c + * contrib/sddodbc/sddodbc.c + * contrib/sddpg/sddpg.c + * contrib/sddsqlt3/sddsqlt3.c + * contrib/xhb/xhbarr.c + * contrib/xhb/xhbdate.c + * contrib/xhb/xhbfs.c + * contrib/xhb/xhbfunc.c + * contrib/xhb/xhbgt.c + * contrib/xhb/xhbhash.c + * contrib/xhb/xhbi18n.c + * contrib/xhb/xhbinet.c + * contrib/xhb/xhbini.c + * contrib/xhb/xhbmtc.c + * contrib/xhb/xhbolec.c + * contrib/xhb/xhbprn.c + * contrib/xhb/xhbproc.c + * contrib/xhb/xhbregx.c + * contrib/xhb/xhbwin.c + * contrib/xhb/xwin_reg.c + * contrib/xhb/xwin_ver.c + * src/rdd/dbcmdhb.c + * src/rdd/dbdrop.c + * src/rdd/dbexists.c + * src/rdd/dbnubs.c + * src/rdd/dbrename.c + * src/rdd/fieldhb.c + * src/rdd/hbsix/sxredir.c + * src/rdd/hsx/cftsfunc.c + * src/rdd/rddinfo.c + * src/rtl/cdpapihb.c + * src/rtl/defpathu.c + * src/rtl/errapiu.c + * src/rtl/natmsgu.c + * src/rtl/pad.c + * src/rtl/shadowu.c + * src/vm/memvclip.c + * use HB_FUNC_TRANSLATE() when creating pure forwarder stubs + (I might rename this to HB_FUNC_FORWARD()) + 2012-10-18 20:59 UTC+0200 Viktor Szakats (harbour syenar.net) * contrib/hbmisc/hb_f.c ! fixed clang warning diff --git a/harbour/contrib/gtwvg/wvgutils.c b/harbour/contrib/gtwvg/wvgutils.c index e830e5c8e0..dbca6aef15 100644 --- a/harbour/contrib/gtwvg/wvgutils.c +++ b/harbour/contrib/gtwvg/wvgutils.c @@ -721,12 +721,7 @@ HB_FUNC( WVT_CREATEPOPUPMENU ) /*-*/ -HB_FUNC_EXTERN( WVG_APPENDMENU ); - -HB_FUNC( WVT_APPENDMENU ) -{ - HB_FUNC_EXEC( WVG_APPENDMENU ); -} +HB_FUNC_TRANSLATE( WVT_APPENDMENU, WVG_APPENDMENU ) /*-*/ @@ -1467,4 +1462,3 @@ void wvt_Size2ArrayEx( SIZE * siz, PHB_ITEM aSize ) } /*-*/ - diff --git a/harbour/contrib/hbct/dbftools.c b/harbour/contrib/hbct/dbftools.c index 11f526dd54..b25c702e7e 100644 --- a/harbour/contrib/hbct/dbftools.c +++ b/harbour/contrib/hbct/dbftools.c @@ -56,24 +56,9 @@ #include "hbapiitm.h" #include "hbapirdd.h" -HB_FUNC_EXTERN( FIELDPOS ); -HB_FUNC_EXTERN( FIELDLEN ); -HB_FUNC_EXTERN( FIELDDEC ); - -HB_FUNC( FIELDSIZE ) -{ - HB_FUNC_EXEC( FIELDLEN ); -} - -HB_FUNC( FIELDDECI ) -{ - HB_FUNC_EXEC( FIELDDEC ); -} - -HB_FUNC( FIELDNUM ) -{ - HB_FUNC_EXEC( FIELDPOS ); -} +HB_FUNC_TRANSLATE( FIELDSIZE, FIELDLEN ) +HB_FUNC_TRANSLATE( FIELDDECI, FIELDDEC ) +HB_FUNC_TRANSLATE( FIELDNUM , FIELDPOS ) HB_FUNC( DBFSIZE ) { diff --git a/harbour/contrib/hbfship/flddeci.c b/harbour/contrib/hbfship/flddeci.c index cbb0896ed2..5dacaca62a 100644 --- a/harbour/contrib/hbfship/flddeci.c +++ b/harbour/contrib/hbfship/flddeci.c @@ -52,9 +52,4 @@ #include "hbapi.h" -HB_FUNC_EXTERN( HB_FIELDDEC ); - -HB_FUNC( FIELDDECI ) -{ - HB_FUNC_EXEC( HB_FIELDDEC ); -} +HB_FUNC_TRANSLATE( FIELDDECI, HB_FIELDDEC ) diff --git a/harbour/contrib/hbfship/isfunc.c b/harbour/contrib/hbfship/isfunc.c index 7ca325d79c..8de81c071a 100644 --- a/harbour/contrib/hbfship/isfunc.c +++ b/harbour/contrib/hbfship/isfunc.c @@ -55,9 +55,4 @@ #include "hbapi.h" -HB_FUNC_EXTERN( HB_ISFUNCTION ); - -HB_FUNC( ISFUNCTION ) -{ - HB_FUNC_EXEC( HB_ISFUNCTION ); -} +HB_FUNC_TRANSLATE( ISFUNCTION, HB_ISFUNCTION ) diff --git a/harbour/contrib/hbfship/secondfs.c b/harbour/contrib/hbfship/secondfs.c index 7a72c35a0e..8667cfa6ad 100644 --- a/harbour/contrib/hbfship/secondfs.c +++ b/harbour/contrib/hbfship/secondfs.c @@ -52,9 +52,4 @@ #include "hbapi.h" -HB_FUNC_EXTERN( HB_SECONDSCPU ); - -HB_FUNC( SECONDSCPU ) -{ - HB_FUNC_EXEC( HB_SECONDSCPU ); -} +HB_FUNC_TRANSLATE( SECONDSCPU, HB_SECONDSCPU ) diff --git a/harbour/contrib/hbnf/mouse.c b/harbour/contrib/hbnf/mouse.c index d081379619..ca74483ed9 100644 --- a/harbour/contrib/hbnf/mouse.c +++ b/harbour/contrib/hbnf/mouse.c @@ -56,6 +56,8 @@ # include #endif +/* http://www.delorie.com/djgpp/doc/rbinter/ix/33/00.html */ + HB_FUNC( _MSET_SENSITIVE ) /* nHoriz, nVert, nDouble */ { #if defined( HB_OS_DOS ) diff --git a/harbour/contrib/hbxpp/dbcmdx.c b/harbour/contrib/hbxpp/dbcmdx.c index f4e4023920..4d3c9b3ae5 100644 --- a/harbour/contrib/hbxpp/dbcmdx.c +++ b/harbour/contrib/hbxpp/dbcmdx.c @@ -52,27 +52,7 @@ */ #include "hbapi.h" -#include "hbapirdd.h" -#include "hbapierr.h" -#include "hbapiitm.h" -HB_FUNC_EXTERN( HB_DBPACK ); - -HB_FUNC( DBPACK ) -{ - HB_FUNC_EXEC( HB_DBPACK ); -} - -HB_FUNC_EXTERN( HB_DBZAP ); - -HB_FUNC( DBZAP ) -{ - HB_FUNC_EXEC( HB_DBZAP ); -} - -HB_FUNC_EXTERN( __DBSKIPPER ); - -HB_FUNC( DBSKIPPER ) -{ - HB_FUNC_EXEC( __DBSKIPPER ); -} +HB_FUNC_TRANSLATE( DBPACK, HB_DBPACK ) +HB_FUNC_TRANSLATE( DBZAP, HB_DBZAP ) +HB_FUNC_TRANSLATE( DBSKIPPER, __DBSKIPPER ) diff --git a/harbour/contrib/hbxpp/dbdetacx.c b/harbour/contrib/hbxpp/dbdetacx.c index dfdae1d26b..750cbd8c8a 100644 --- a/harbour/contrib/hbxpp/dbdetacx.c +++ b/harbour/contrib/hbxpp/dbdetacx.c @@ -52,16 +52,5 @@ #include "hbapi.h" -HB_FUNC_EXTERN( HB_DBDETACH ); - -HB_FUNC( DBRELEASE ) -{ - HB_FUNC_EXEC( HB_DBDETACH ); -} - -HB_FUNC_EXTERN( HB_DBREQUEST ); - -HB_FUNC( DBREQUEST ) -{ - HB_FUNC_EXEC( HB_DBREQUEST ); -} +HB_FUNC_TRANSLATE( DBRELEASE, HB_DBDETACH ) +HB_FUNC_TRANSLATE( DBREQUEST, HB_DBREQUEST ) diff --git a/harbour/contrib/hbxpp/dllx.c b/harbour/contrib/hbxpp/dllx.c index 14a3457d2e..1fec42ad19 100644 --- a/harbour/contrib/hbxpp/dllx.c +++ b/harbour/contrib/hbxpp/dllx.c @@ -96,22 +96,10 @@ static const HB_GC_FUNCS s_gcDllFuncs = _DLLMark }; -/* NOTE: In Harbour this function will return an in-memory object, not a string. */ -/* NOTE: 2nd and 3rd parameters are not supported in Harbour. */ - -HB_FUNC_EXTERN( HB_LIBLOAD ); - -HB_FUNC( DLLLOAD ) -{ - HB_FUNC_EXEC( HB_LIBLOAD ); -} - -HB_FUNC_EXTERN( HB_LIBFREE ); - -HB_FUNC( DLLUNLOAD ) -{ - HB_FUNC_EXEC( HB_LIBFREE ); -} +/* NOTE: In Harbour this function will return an in-memory object, not a string. + 2nd and 3rd parameters are not supported in Harbour. */ +HB_FUNC_TRANSLATE( DLLLOAD, HB_LIBLOAD ) +HB_FUNC_TRANSLATE( DLLUNLOAD, HB_LIBFREE ) /* NOTE: Function ordinals are not supported in 3rd parameter. */ diff --git a/harbour/contrib/rddsql/sqlmix.c b/harbour/contrib/rddsql/sqlmix.c index 30d33aaf11..29954c3ddb 100644 --- a/harbour/contrib/rddsql/sqlmix.c +++ b/harbour/contrib/rddsql/sqlmix.c @@ -2175,11 +2175,8 @@ static RDDFUNCS sqlmixTable = ( DBENTRYP_SVP ) NULL, /* sqlmixWhoCares */ }; - -HB_FUNC_EXTERN( SQLBASE ); HB_FUNC( SQLMIX ) -{ - HB_FUNC_EXEC( SQLBASE ); -} +/* force SQLBASE linking */ +HB_FUNC_TRANSLATE( SQLMIX, SQLBASE ) HB_FUNC_STATIC( SQLMIX_GETFUNCTABLE ) { diff --git a/harbour/contrib/sddfb/sddfb.c b/harbour/contrib/sddfb/sddfb.c index 85cb41f1e7..e07a20ae32 100644 --- a/harbour/contrib/sddfb/sddfb.c +++ b/harbour/contrib/sddfb/sddfb.c @@ -109,7 +109,7 @@ static void hb_firebirddd_init( void * cargo ) } /* force SQLBASE linking */ -HB_FUNC_EXTERN( SQLBASE ); HB_FUNC( SDDFB ) { HB_FUNC_EXEC( SQLBASE ); } +HB_FUNC_TRANSLATE( SDDFB, SQLBASE ) HB_INIT_SYMBOLS_BEGIN( firebirddd__InitSymbols ) { "SDDFB", { HB_FS_PUBLIC | HB_FS_LOCAL }, { HB_FUNCNAME( SDDFB ) }, NULL }, diff --git a/harbour/contrib/sddmy/sddmy.c b/harbour/contrib/sddmy/sddmy.c index ca53a1714f..6596659ae7 100644 --- a/harbour/contrib/sddmy/sddmy.c +++ b/harbour/contrib/sddmy/sddmy.c @@ -116,7 +116,7 @@ static void hb_mysqldd_init( void * cargo ) } /* force SQLBASE linking */ -HB_FUNC_EXTERN( SQLBASE ); HB_FUNC( SDDMY ) { HB_FUNC_EXEC( SQLBASE ); } +HB_FUNC_TRANSLATE( SDDMY, SQLBASE ) HB_INIT_SYMBOLS_BEGIN( mysqldd__InitSymbols ) { "SDDMY", { HB_FS_PUBLIC }, { HB_FUNCNAME( SDDMY ) }, NULL }, diff --git a/harbour/contrib/sddoci/sddoci.c b/harbour/contrib/sddoci/sddoci.c index 9f75f9e245..9f3dea984e 100644 --- a/harbour/contrib/sddoci/sddoci.c +++ b/harbour/contrib/sddoci/sddoci.c @@ -149,7 +149,7 @@ static void hb_ocidd_exit( void * cargo ) } /* force SQLBASE linking */ -HB_FUNC_EXTERN( SQLBASE ); HB_FUNC( SDDOCI ) { HB_FUNC_EXEC( SQLBASE ); } +HB_FUNC_TRANSLATE( SDDOCI, SQLBASE ) HB_INIT_SYMBOLS_BEGIN( ocidd__InitSymbols ) { "SDDOCI", {HB_FS_PUBLIC}, {HB_FUNCNAME( SDDOCI )}, NULL }, diff --git a/harbour/contrib/sddodbc/sddodbc.c b/harbour/contrib/sddodbc/sddodbc.c index 52a4db14f9..932d801898 100644 --- a/harbour/contrib/sddodbc/sddodbc.c +++ b/harbour/contrib/sddodbc/sddodbc.c @@ -138,7 +138,7 @@ static void hb_odbcdd_init( void * cargo ) } /* force SQLBASE linking */ -HB_FUNC_EXTERN( SQLBASE ); HB_FUNC( SDDODBC ) { HB_FUNC_EXEC( SQLBASE ); } +HB_FUNC_TRANSLATE( SDDODBC, SQLBASE ) HB_INIT_SYMBOLS_BEGIN( odbcdd__InitSymbols ) { "SDDODBC", { HB_FS_PUBLIC }, { HB_FUNCNAME( SDDODBC ) }, NULL }, diff --git a/harbour/contrib/sddpg/sddpg.c b/harbour/contrib/sddpg/sddpg.c index d0d5b90ffb..766958118a 100644 --- a/harbour/contrib/sddpg/sddpg.c +++ b/harbour/contrib/sddpg/sddpg.c @@ -128,7 +128,7 @@ static void hb_pgsqldd_init( void * cargo ) } /* force SQLBASE linking */ -HB_FUNC_EXTERN( SQLBASE ); HB_FUNC( SDDPG ) { HB_FUNC_EXEC( SQLBASE ); } +HB_FUNC_TRANSLATE( SDDPG, SQLBASE ) HB_INIT_SYMBOLS_BEGIN( sddpostgre__InitSymbols ) { "SDDPG", { HB_FS_PUBLIC | HB_FS_LOCAL }, { HB_FUNCNAME( SDDPG ) }, NULL }, diff --git a/harbour/contrib/sddsqlt3/sddsqlt3.c b/harbour/contrib/sddsqlt3/sddsqlt3.c index 532f341ee4..ed3eed475b 100644 --- a/harbour/contrib/sddsqlt3/sddsqlt3.c +++ b/harbour/contrib/sddsqlt3/sddsqlt3.c @@ -122,7 +122,7 @@ static void hb_sqlt3dd_exit( void * cargo ) } /* force SQLBASE linking */ -HB_FUNC_EXTERN( SQLBASE ); HB_FUNC( SDDSQLITE3 ) { HB_FUNC_EXEC( SQLBASE ); } +HB_FUNC_TRANSLATE( SDDSQLITE3, SQLBASE ) HB_INIT_SYMBOLS_BEGIN( sqlt3dd__InitSymbols ) { "SDDSQLITE3", {HB_FS_PUBLIC}, {HB_FUNCNAME( SDDSQLITE3 )}, NULL }, diff --git a/harbour/contrib/xhb/xhbarr.c b/harbour/contrib/xhb/xhbarr.c index 8e92db408d..2f386ad4b2 100644 --- a/harbour/contrib/xhb/xhbarr.c +++ b/harbour/contrib/xhb/xhbarr.c @@ -156,10 +156,7 @@ HB_FUNC( ASPLICE ) /* TOFIX: Move this to hbxpp library */ /* Synonym of aSplice() Xbase++ compatibility (extended with optional replacemenet values) */ -HB_FUNC( AREMOVE ) -{ - HB_FUNC_EXEC( ASPLICE ) -} +HB_FUNC_TRANSLATE( AREMOVE, ASPLICE ) /* aMerge( , [, ] ) => aTarget */ HB_FUNC( AMERGE ) @@ -258,4 +255,4 @@ HB_FUNC( XHB_AINS ) } } -HB_FUNC_EXTERN( HB_RASCAN ) ; HB_FUNC( RASCAN ) { HB_FUNC_EXEC( HB_RASCAN ); } +HB_FUNC_TRANSLATE( RASCAN, HB_RASCAN ) diff --git a/harbour/contrib/xhb/xhbdate.c b/harbour/contrib/xhb/xhbdate.c index c5c99f06d0..3e6a1a2b0e 100644 --- a/harbour/contrib/xhb/xhbdate.c +++ b/harbour/contrib/xhb/xhbdate.c @@ -52,10 +52,10 @@ #include "hbapi.h" -HB_FUNC_EXTERN( HB_DATETIME ) ; HB_FUNC( DATETIME ) { HB_FUNC_EXEC( HB_DATETIME ); } -HB_FUNC_EXTERN( HB_HOUR ) ; HB_FUNC( HOUR ) { HB_FUNC_EXEC( HB_HOUR ); } -HB_FUNC_EXTERN( HB_MINUTE ) ; HB_FUNC( MINUTE ) { HB_FUNC_EXEC( HB_MINUTE ); } -HB_FUNC_EXTERN( HB_TTOS ) ; HB_FUNC( TTOS ) { HB_FUNC_EXEC( HB_TTOS ); } -HB_FUNC_EXTERN( HB_STOT ) ; HB_FUNC( STOT ) { HB_FUNC_EXEC( HB_STOT ); } -HB_FUNC_EXTERN( HB_TTOC ) ; HB_FUNC( TTOC ) { HB_FUNC_EXEC( HB_TTOC ); } -HB_FUNC_EXTERN( HB_CTOT ) ; HB_FUNC( CTOT ) { HB_FUNC_EXEC( HB_CTOT ); } +HB_FUNC_TRANSLATE( DATETIME , HB_DATETIME ) +HB_FUNC_TRANSLATE( HOUR , HB_HOUR ) +HB_FUNC_TRANSLATE( MINUTE , HB_MINUTE ) +HB_FUNC_TRANSLATE( TTOS , HB_TTOS ) +HB_FUNC_TRANSLATE( STOT , HB_STOT ) +HB_FUNC_TRANSLATE( TTOC , HB_TTOC ) +HB_FUNC_TRANSLATE( CTOT , HB_CTOT ) diff --git a/harbour/contrib/xhb/xhbfs.c b/harbour/contrib/xhb/xhbfs.c index 93728a87b0..8f15d7a05a 100644 --- a/harbour/contrib/xhb/xhbfs.c +++ b/harbour/contrib/xhb/xhbfs.c @@ -78,9 +78,5 @@ HB_FUNC( ISDIRECTORY ) hb_retl( bRetVal ); } -HB_FUNC( ISDIR ) -{ - HB_FUNC_EXEC( ISDIRECTORY ); -} - -HB_FUNC_EXTERN( HB_DISABLEWAITLOCKS ) ; HB_FUNC( DISABLEWAITLOCKS ) { HB_FUNC_EXEC( HB_DISABLEWAITLOCKS ); } +HB_FUNC_TRANSLATE( ISDIR, ISDIRECTORY ) +HB_FUNC_TRANSLATE( DISABLEWAITLOCKS, HB_DISABLEWAITLOCKS ) diff --git a/harbour/contrib/xhb/xhbfunc.c b/harbour/contrib/xhb/xhbfunc.c index 423795fb1e..b8084a269f 100644 --- a/harbour/contrib/xhb/xhbfunc.c +++ b/harbour/contrib/xhb/xhbfunc.c @@ -103,16 +103,12 @@ HB_FUNC( HB_STRING2POINTER ) #endif -HB_FUNC_EXTERN( HB_PROGNAME ); +/* xHarbour really returns: + * hb_retc( hb_cmdargARGVN( 0 ) ); + * probably typo - replicated here by HB_PROGNAME() + */ +HB_FUNC_TRANSLATE( HB_CMDARGARGV, HB_PROGNAME ) -HB_FUNC( HB_CMDARGARGV ) -{ - /* xHarbour really returns: - * hb_retc( hb_cmdargARGVN( 0 ) ); - * probably typo - replicated here by HB_PROGNAME() - */ - HB_FUNC_EXEC( HB_PROGNAME ); -} HB_FUNC( HB_VMMODE ) { @@ -189,8 +185,6 @@ HB_FUNC( HB_GETLEN8 ) hb_retni( -1 ); } -HB_FUNC_EXTERN( HB_DESERIALIZE ); - HB_FUNC( HB_DESERIALBEGIN ) { PHB_ITEM pItem = hb_param( 1, HB_IT_STRING ); @@ -198,25 +192,9 @@ HB_FUNC( HB_DESERIALBEGIN ) hb_itemReturn( pItem ); } -HB_FUNC( HB_DESERIALNEXT ) -{ - HB_FUNC_EXEC( HB_DESERIALIZE ); -} - - -HB_FUNC_EXTERN( HB_WILDMATCH ); - -HB_FUNC( WILDMATCH ) -{ - HB_FUNC_EXEC( HB_WILDMATCH ); -} - -HB_FUNC_EXTERN( HB_ADLER32 ); - -HB_FUNC( HB_CHECKSUM ) -{ - HB_FUNC_EXEC( HB_ADLER32 ); -} +HB_FUNC_TRANSLATE( HB_DESERIALNEXT, HB_DESERIALIZE ) +HB_FUNC_TRANSLATE( WILDMATCH, HB_WILDMATCH ) +HB_FUNC_TRANSLATE( HB_CHECKSUM, HB_ADLER32 ) HB_FUNC( HB_F_EOF ) { @@ -260,12 +238,7 @@ HB_FUNC( CURDIRX ) hb_fsSetError( uiErrorOld ); } -HB_FUNC_EXTERN( HB_CSTR ); - -HB_FUNC( CSTR ) -{ - HB_FUNC_EXEC( HB_CSTR ); -} +HB_FUNC_TRANSLATE( CSTR, HB_CSTR ) HB_FUNC( HB_ARRAYID ) /* for debugging: returns the array's "address" so dual references to same array can be seen */ { @@ -346,18 +319,18 @@ HB_FUNC( HB_ISBYREF ) #endif -HB_FUNC_EXTERN( HB_METHODNAME ) ; HB_FUNC( METHODNAME ) { HB_FUNC_EXEC( HB_METHODNAME ); } -HB_FUNC_EXTERN( HB_LIBLOAD ) ; HB_FUNC( LIBLOAD ) { HB_FUNC_EXEC( HB_LIBLOAD ); } -HB_FUNC_EXTERN( HB_LIBFREE ) ; HB_FUNC( LIBFREE ) { HB_FUNC_EXEC( HB_LIBFREE ); } -HB_FUNC_EXTERN( DO ) ; HB_FUNC( HB_LIBDO ) { HB_FUNC_EXEC( DO ); } -HB_FUNC_EXTERN( HB_BITTEST ) ; HB_FUNC( HB_BITISSET ) { HB_FUNC_EXEC( HB_BITTEST ); } -HB_FUNC_EXTERN( HB_IDLESLEEP ) ; HB_FUNC( SECONDSSLEEP ) { HB_FUNC_EXEC( HB_IDLESLEEP ); } -HB_FUNC_EXTERN( __DYNSN2SYM ) ; HB_FUNC( HB_FUNCPTR ) { HB_FUNC_EXEC( __DYNSN2SYM ); } -HB_FUNC_EXTERN( HB_VALTOEXP ) ; HB_FUNC( VALTOPRGEXP ) { HB_FUNC_EXEC( HB_VALTOEXP ); } -HB_FUNC_EXTERN( HB_HEXTONUM ) ; HB_FUNC( HEXTONUM ) { HB_FUNC_EXEC( HB_HEXTONUM ); } -HB_FUNC_EXTERN( HB_NUMTOHEX ) ; HB_FUNC( NUMTOHEX ) { HB_FUNC_EXEC( HB_NUMTOHEX ); } -HB_FUNC_EXTERN( HB_HEXTOSTR ) ; HB_FUNC( HEXTOSTR ) { HB_FUNC_EXEC( HB_HEXTOSTR ); } -HB_FUNC_EXTERN( HB_STRTOHEX ) ; HB_FUNC( STRTOHEX ) { HB_FUNC_EXEC( HB_STRTOHEX ); } -HB_FUNC_EXTERN( HB_ISPOINTER ) ; HB_FUNC( ISPOINTER ) { HB_FUNC_EXEC( HB_ISPOINTER ); } -HB_FUNC_EXTERN( HB_CDPSELECT ) ; HB_FUNC( HB_SETCODEPAGE ) { HB_FUNC_EXEC( HB_CDPSELECT ); } -HB_FUNC_EXTERN( __DEFAULTNIL ) ; HB_FUNC( DEFAULT ) { HB_FUNC_EXEC( __DEFAULTNIL ); } +HB_FUNC_TRANSLATE( METHODNAME , HB_METHODNAME ) +HB_FUNC_TRANSLATE( LIBLOAD , HB_LIBLOAD ) +HB_FUNC_TRANSLATE( LIBFREE , HB_LIBFREE ) +HB_FUNC_TRANSLATE( HB_LIBDO , DO ) +HB_FUNC_TRANSLATE( HB_BITISSET , HB_BITTEST ) +HB_FUNC_TRANSLATE( SECONDSSLEEP , HB_IDLESLEEP ) +HB_FUNC_TRANSLATE( HB_FUNCPTR , __DYNSN2SYM ) +HB_FUNC_TRANSLATE( VALTOPRGEXP , HB_VALTOEXP ) +HB_FUNC_TRANSLATE( HEXTONUM , HB_HEXTONUM ) +HB_FUNC_TRANSLATE( NUMTOHEX , HB_NUMTOHEX ) +HB_FUNC_TRANSLATE( HEXTOSTR , HB_HEXTOSTR ) +HB_FUNC_TRANSLATE( STRTOHEX , HB_STRTOHEX ) +HB_FUNC_TRANSLATE( ISPOINTER , HB_ISPOINTER ) +HB_FUNC_TRANSLATE( HB_SETCODEPAGE , HB_CDPSELECT ) +HB_FUNC_TRANSLATE( DEFAULT , __DEFAULTNIL ) diff --git a/harbour/contrib/xhb/xhbgt.c b/harbour/contrib/xhb/xhbgt.c index 93e519f753..8a5b69c406 100644 --- a/harbour/contrib/xhb/xhbgt.c +++ b/harbour/contrib/xhb/xhbgt.c @@ -52,8 +52,8 @@ #include "hbapi.h" -HB_FUNC_EXTERN( NEXTKEY ) ; HB_FUNC( GTPROCESSMESSAGES ) { HB_FUNC_EXEC( NEXTKEY ); } -HB_FUNC_EXTERN( HB_GFXPRIMITIVE ) ; HB_FUNC( GFXPRIMITIVE ) { HB_FUNC_EXEC( HB_GFXPRIMITIVE ); } -HB_FUNC_EXTERN( HB_GFXTEXT ) ; HB_FUNC( GFXTEXT ) { HB_FUNC_EXEC( HB_GFXTEXT ); } -HB_FUNC_EXTERN( HB_GTLOCK ) ; HB_FUNC( HBCONSOLELOCK ) { HB_FUNC_EXEC( HB_GTLOCK ); } -HB_FUNC_EXTERN( HB_GTUNLOCK ) ; HB_FUNC( HBCONSOLEUNLOCK ) { HB_FUNC_EXEC( HB_GTUNLOCK ); } +HB_FUNC_TRANSLATE( GTPROCESSMESSAGES , NEXTKEY ) +HB_FUNC_TRANSLATE( GFXPRIMITIVE , HB_GFXPRIMITIVE ) +HB_FUNC_TRANSLATE( GFXTEXT , HB_GFXTEXT ) +HB_FUNC_TRANSLATE( HBCONSOLELOCK , HB_GTLOCK ) +HB_FUNC_TRANSLATE( HBCONSOLEUNLOCK , HB_GTUNLOCK ) diff --git a/harbour/contrib/xhb/xhbhash.c b/harbour/contrib/xhb/xhbhash.c index e7b6dfd6eb..6dfe3eeecc 100644 --- a/harbour/contrib/xhb/xhbhash.c +++ b/harbour/contrib/xhb/xhbhash.c @@ -52,29 +52,29 @@ #include "hbapiitm.h" -/* Hash item functions */ -HB_FUNC_EXTERN( HB_HASH ) ; HB_FUNC( HASH ) { HB_FUNC_EXEC( HB_HASH ); } -HB_FUNC_EXTERN( HB_HHASKEY ) ; HB_FUNC( HHASKEY ) { HB_FUNC_EXEC( HB_HHASKEY ); } -HB_FUNC_EXTERN( HB_HPOS ) ; HB_FUNC( HGETPOS ) { HB_FUNC_EXEC( HB_HPOS ); } -HB_FUNC_EXTERN( HB_HGET ) ; HB_FUNC( HGET ) { HB_FUNC_EXEC( HB_HGET ); } -HB_FUNC_EXTERN( HB_HSET ) ; HB_FUNC( HSET ) { HB_FUNC_EXEC( HB_HSET ); } -HB_FUNC_EXTERN( HB_HDEL ) ; HB_FUNC( HDEL ) { HB_FUNC_EXEC( HB_HDEL ); } -HB_FUNC_EXTERN( HB_HKEYAT ) ; HB_FUNC( HGETKEYAT ) { HB_FUNC_EXEC( HB_HKEYAT ); } -HB_FUNC_EXTERN( HB_HVALUEAT ) ; HB_FUNC( HGETVALUEAT ) { HB_FUNC_EXEC( HB_HVALUEAT ); } -HB_FUNC_EXTERN( HB_HVALUEAT ) ; HB_FUNC( HSETVALUEAT ) { HB_FUNC_EXEC( HB_HVALUEAT ); } -HB_FUNC_EXTERN( HB_HPAIRAT ) ; HB_FUNC( HGETPAIRAT ) { HB_FUNC_EXEC( HB_HPAIRAT ); } -HB_FUNC_EXTERN( HB_HDELAT ) ; HB_FUNC( HDELAT ) { HB_FUNC_EXEC( HB_HDELAT ); } -HB_FUNC_EXTERN( HB_HKEYS ) ; HB_FUNC( HGETKEYS ) { HB_FUNC_EXEC( HB_HKEYS ); } -HB_FUNC_EXTERN( HB_HVALUES ) ; HB_FUNC( HGETVALUES ) { HB_FUNC_EXEC( HB_HVALUES ); } -HB_FUNC_EXTERN( HB_HFILL ) ; HB_FUNC( HFILL ) { HB_FUNC_EXEC( HB_HFILL ); } -HB_FUNC_EXTERN( HB_HCLONE ) ; HB_FUNC( HCLONE ) { HB_FUNC_EXEC( HB_HCLONE ); } -HB_FUNC_EXTERN( HB_HCOPY ) ; HB_FUNC( HCOPY ) { HB_FUNC_EXEC( HB_HCOPY ); } -HB_FUNC_EXTERN( HB_HMERGE ) ; HB_FUNC( HMERGE ) { HB_FUNC_EXEC( HB_HMERGE ); } -HB_FUNC_EXTERN( HB_HEVAL ) ; HB_FUNC( HEVAL ) { HB_FUNC_EXEC( HB_HEVAL ); } -HB_FUNC_EXTERN( HB_HSCAN ) ; HB_FUNC( HSCAN ) { HB_FUNC_EXEC( HB_HSCAN ); } -HB_FUNC_EXTERN( HB_HALLOCATE ) ; HB_FUNC( HALLOCATE ) { HB_FUNC_EXEC( HB_HALLOCATE ); } -HB_FUNC_EXTERN( HB_HDEFAULT ) ; HB_FUNC( HDEFAULT ) { HB_FUNC_EXEC( HB_HDEFAULT ); } -HB_FUNC_EXTERN( HB_HCASEMATCH ) ; HB_FUNC( HSETCASEMATCH ) { HB_FUNC_EXEC( HB_HCASEMATCH ); hb_itemReturn( hb_param( 1, HB_IT_HASH ) ); } -HB_FUNC_EXTERN( HB_HCASEMATCH ) ; HB_FUNC( HGETCASEMATCH ) { HB_FUNC_EXEC( HB_HCASEMATCH ); } -HB_FUNC_EXTERN( HB_HAUTOADD ) ; HB_FUNC( HSETAUTOADD ) { HB_FUNC_EXEC( HB_HAUTOADD ); hb_itemReturn( hb_param( 1, HB_IT_HASH ) ); } -HB_FUNC_EXTERN( HB_HAUTOADD ) ; HB_FUNC( HGETAUTOADD ) { HB_FUNC_EXEC( HB_HAUTOADD ); hb_retl( hb_parni( -1 ) == HB_HASH_AUTOADD_ALWAYS ); } +HB_FUNC_TRANSLATE( HASH , HB_HASH ) +HB_FUNC_TRANSLATE( HHASKEY , HB_HHASKEY ) +HB_FUNC_TRANSLATE( HGETPOS , HB_HPOS ) +HB_FUNC_TRANSLATE( HGET , HB_HGET ) +HB_FUNC_TRANSLATE( HSET , HB_HSET ) +HB_FUNC_TRANSLATE( HDEL , HB_HDEL ) +HB_FUNC_TRANSLATE( HGETKEYAT , HB_HKEYAT ) +HB_FUNC_TRANSLATE( HGETVALUEAT , HB_HVALUEAT ) +HB_FUNC_TRANSLATE( HSETVALUEAT , HB_HVALUEAT ) +HB_FUNC_TRANSLATE( HGETPAIRAT , HB_HPAIRAT ) +HB_FUNC_TRANSLATE( HDELAT , HB_HDELAT ) +HB_FUNC_TRANSLATE( HGETKEYS , HB_HKEYS ) +HB_FUNC_TRANSLATE( HGETVALUES , HB_HVALUES ) +HB_FUNC_TRANSLATE( HFILL , HB_HFILL ) +HB_FUNC_TRANSLATE( HCLONE , HB_HCLONE ) +HB_FUNC_TRANSLATE( HCOPY , HB_HCOPY ) +HB_FUNC_TRANSLATE( HMERGE , HB_HMERGE ) +HB_FUNC_TRANSLATE( HEVAL , HB_HEVAL ) +HB_FUNC_TRANSLATE( HSCAN , HB_HSCAN ) +HB_FUNC_TRANSLATE( HALLOCATE , HB_HALLOCATE ) +HB_FUNC_TRANSLATE( HDEFAULT , HB_HDEFAULT ) +HB_FUNC_TRANSLATE( HGETCASEMATCH , HB_HCASEMATCH ) + +HB_FUNC_EXTERN( HB_HCASEMATCH ) ; HB_FUNC( HSETCASEMATCH ) { HB_FUNC_EXEC( HB_HCASEMATCH ); hb_itemReturn( hb_param( 1, HB_IT_HASH ) ); } +HB_FUNC_EXTERN( HB_HAUTOADD ) ; HB_FUNC( HSETAUTOADD ) { HB_FUNC_EXEC( HB_HAUTOADD ); hb_itemReturn( hb_param( 1, HB_IT_HASH ) ); } +HB_FUNC_EXTERN( HB_HAUTOADD ) ; HB_FUNC( HGETAUTOADD ) { HB_FUNC_EXEC( HB_HAUTOADD ); hb_retl( hb_parni( -1 ) == HB_HASH_AUTOADD_ALWAYS ); } diff --git a/harbour/contrib/xhb/xhbi18n.c b/harbour/contrib/xhb/xhbi18n.c index 07730ef3b3..ef97d83ab1 100644 --- a/harbour/contrib/xhb/xhbi18n.c +++ b/harbour/contrib/xhb/xhbi18n.c @@ -52,4 +52,4 @@ #include "hbapi.h" -HB_FUNC_EXTERN( HB_I18N_GETTEXT ) ; HB_FUNC( I18N ) { HB_FUNC_EXEC( HB_I18N_GETTEXT ); } +HB_FUNC_TRANSLATE( I18N, HB_I18N_GETTEXT ) diff --git a/harbour/contrib/xhb/xhbinet.c b/harbour/contrib/xhb/xhbinet.c index d6bc2c77b3..fe619f7716 100644 --- a/harbour/contrib/xhb/xhbinet.c +++ b/harbour/contrib/xhb/xhbinet.c @@ -52,44 +52,43 @@ #include "hbapi.h" -/* Inet functions */ -HB_FUNC_EXTERN( HB_INETINIT ) ; HB_FUNC( INETINIT ) { HB_FUNC_EXEC( HB_INETINIT ); } -HB_FUNC_EXTERN( HB_INETCLEANUP ) ; HB_FUNC( INETCLEANUP ) { HB_FUNC_EXEC( HB_INETCLEANUP ); } -HB_FUNC_EXTERN( HB_INETCREATE ) ; HB_FUNC( INETCREATE ) { HB_FUNC_EXEC( HB_INETCREATE ); } -HB_FUNC_EXTERN( HB_INETCLOSE ) ; HB_FUNC( INETCLOSE ) { HB_FUNC_EXEC( HB_INETCLOSE ); } -HB_FUNC_EXTERN( HB_INETFD ) ; HB_FUNC( INETFD ) { HB_FUNC_EXEC( HB_INETFD ); } -HB_FUNC_EXTERN( HB_INETSTATUS ) ; HB_FUNC( INETSTATUS ) { HB_FUNC_EXEC( HB_INETSTATUS ); } -HB_FUNC_EXTERN( HB_INETERRORCODE ) ; HB_FUNC( INETERRORCODE ) { HB_FUNC_EXEC( HB_INETERRORCODE ); } -HB_FUNC_EXTERN( HB_INETERRORDESC ) ; HB_FUNC( INETERRORDESC ) { HB_FUNC_EXEC( HB_INETERRORDESC ); } -HB_FUNC_EXTERN( HB_INETCLEARERROR ) ; HB_FUNC( INETCLEARERROR ) { HB_FUNC_EXEC( HB_INETCLEARERROR ); } -HB_FUNC_EXTERN( HB_INETCOUNT ) ; HB_FUNC( INETCOUNT ) { HB_FUNC_EXEC( HB_INETCOUNT ); } -HB_FUNC_EXTERN( HB_INETADDRESS ) ; HB_FUNC( INETADDRESS ) { HB_FUNC_EXEC( HB_INETADDRESS ); } -HB_FUNC_EXTERN( HB_INETPORT ) ; HB_FUNC( INETPORT ) { HB_FUNC_EXEC( HB_INETPORT ); } -HB_FUNC_EXTERN( HB_INETTIMEOUT ) ; HB_FUNC( INETSETTIMEOUT ) { HB_FUNC_EXEC( HB_INETTIMEOUT ); } -HB_FUNC_EXTERN( HB_INETTIMEOUT ) ; HB_FUNC( INETGETTIMEOUT ) { HB_FUNC_EXEC( HB_INETTIMEOUT ); } -HB_FUNC_EXTERN( HB_INETCLEARTIMEOUT ) ; HB_FUNC( INETCLEARTIMEOUT ) { HB_FUNC_EXEC( HB_INETCLEARTIMEOUT ); } -HB_FUNC_EXTERN( HB_INETTIMELIMIT ) ; HB_FUNC( INETSETTIMELIMIT ) { HB_FUNC_EXEC( HB_INETTIMELIMIT ); } -HB_FUNC_EXTERN( HB_INETTIMELIMIT ) ; HB_FUNC( INETGETTIMELIMIT ) { HB_FUNC_EXEC( HB_INETTIMELIMIT ); } -HB_FUNC_EXTERN( HB_INETCLEARTIMELIMIT ) ; HB_FUNC( INETCLEARTIMELIMIT ) { HB_FUNC_EXEC( HB_INETCLEARTIMELIMIT ); } -HB_FUNC_EXTERN( HB_INETPERIODCALLBACK ) ; HB_FUNC( INETSETPERIODCALLBACK ) { HB_FUNC_EXEC( HB_INETPERIODCALLBACK ); } -HB_FUNC_EXTERN( HB_INETPERIODCALLBACK ) ; HB_FUNC( INETGETPERIODCALLBACK ) { HB_FUNC_EXEC( HB_INETPERIODCALLBACK ); } -HB_FUNC_EXTERN( HB_INETCLEARPERIODCALLBACK ) ; HB_FUNC( INETCLEARPERIODCALLBACK ) { HB_FUNC_EXEC( HB_INETCLEARPERIODCALLBACK ); } -HB_FUNC_EXTERN( HB_INETRECV ) ; HB_FUNC( INETRECV ) { HB_FUNC_EXEC( HB_INETRECV ); } -HB_FUNC_EXTERN( HB_INETRECVALL ) ; HB_FUNC( INETRECVALL ) { HB_FUNC_EXEC( HB_INETRECVALL ); } -HB_FUNC_EXTERN( HB_INETRECVLINE ) ; HB_FUNC( INETRECVLINE ) { HB_FUNC_EXEC( HB_INETRECVLINE ); } -HB_FUNC_EXTERN( HB_INETRECVENDBLOCK ) ; HB_FUNC( INETRECVENDBLOCK ) { HB_FUNC_EXEC( HB_INETRECVENDBLOCK ); } -HB_FUNC_EXTERN( HB_INETDATAREADY ) ; HB_FUNC( INETDATAREADY ) { HB_FUNC_EXEC( HB_INETDATAREADY ); } -HB_FUNC_EXTERN( HB_INETSEND ) ; HB_FUNC( INETSEND ) { HB_FUNC_EXEC( HB_INETSEND ); } -HB_FUNC_EXTERN( HB_INETSENDALL ) ; HB_FUNC( INETSENDALL ) { HB_FUNC_EXEC( HB_INETSENDALL ); } -HB_FUNC_EXTERN( HB_INETGETHOSTS ) ; HB_FUNC( INETGETHOSTS ) { HB_FUNC_EXEC( HB_INETGETHOSTS ); } -HB_FUNC_EXTERN( HB_INETGETALIAS ) ; HB_FUNC( INETGETALIAS ) { HB_FUNC_EXEC( HB_INETGETALIAS ); } -HB_FUNC_EXTERN( HB_INETSERVER ) ; HB_FUNC( INETSERVER ) { HB_FUNC_EXEC( HB_INETSERVER ); } -HB_FUNC_EXTERN( HB_INETACCEPT ) ; HB_FUNC( INETACCEPT ) { HB_FUNC_EXEC( HB_INETACCEPT ); } -HB_FUNC_EXTERN( HB_INETCONNECT ) ; HB_FUNC( INETCONNECT ) { HB_FUNC_EXEC( HB_INETCONNECT ); } -HB_FUNC_EXTERN( HB_INETCONNECTIP ) ; HB_FUNC( INETCONNECTIP ) { HB_FUNC_EXEC( HB_INETCONNECTIP ); } -HB_FUNC_EXTERN( HB_INETDGRAMBIND ) ; HB_FUNC( INETDGRAMBIND ) { HB_FUNC_EXEC( HB_INETDGRAMBIND ); } -HB_FUNC_EXTERN( HB_INETDGRAM ) ; HB_FUNC( INETDGRAM ) { HB_FUNC_EXEC( HB_INETDGRAM ); } -HB_FUNC_EXTERN( HB_INETDGRAMSEND ) ; HB_FUNC( INETDGRAMSEND ) { HB_FUNC_EXEC( HB_INETDGRAMSEND ); } -HB_FUNC_EXTERN( HB_INETDGRAMRECV ) ; HB_FUNC( INETDGRAMRECV ) { HB_FUNC_EXEC( HB_INETDGRAMRECV ); } -HB_FUNC_EXTERN( HB_INETCRLF ) ; HB_FUNC( INETCRLF ) { HB_FUNC_EXEC( HB_INETCRLF ); } -HB_FUNC_EXTERN( HB_INETISSOCKET ) ; HB_FUNC( INETISSOCKET ) { HB_FUNC_EXEC( HB_INETISSOCKET ); } +HB_FUNC_TRANSLATE( INETINIT , HB_INETINIT ) +HB_FUNC_TRANSLATE( INETCLEANUP , HB_INETCLEANUP ) +HB_FUNC_TRANSLATE( INETCREATE , HB_INETCREATE ) +HB_FUNC_TRANSLATE( INETCLOSE , HB_INETCLOSE ) +HB_FUNC_TRANSLATE( INETFD , HB_INETFD ) +HB_FUNC_TRANSLATE( INETSTATUS , HB_INETSTATUS ) +HB_FUNC_TRANSLATE( INETERRORCODE , HB_INETERRORCODE ) +HB_FUNC_TRANSLATE( INETERRORDESC , HB_INETERRORDESC ) +HB_FUNC_TRANSLATE( INETCLEARERROR , HB_INETCLEARERROR ) +HB_FUNC_TRANSLATE( INETCOUNT , HB_INETCOUNT ) +HB_FUNC_TRANSLATE( INETADDRESS , HB_INETADDRESS ) +HB_FUNC_TRANSLATE( INETPORT , HB_INETPORT ) +HB_FUNC_TRANSLATE( INETSETTIMEOUT , HB_INETTIMEOUT ) +HB_FUNC_TRANSLATE( INETGETTIMEOUT , HB_INETTIMEOUT ) +HB_FUNC_TRANSLATE( INETCLEARTIMEOUT , HB_INETCLEARTIMEOUT ) +HB_FUNC_TRANSLATE( INETSETTIMELIMIT , HB_INETTIMELIMIT ) +HB_FUNC_TRANSLATE( INETGETTIMELIMIT , HB_INETTIMELIMIT ) +HB_FUNC_TRANSLATE( INETCLEARTIMELIMIT , HB_INETCLEARTIMELIMIT ) +HB_FUNC_TRANSLATE( INETSETPERIODCALLBACK , HB_INETPERIODCALLBACK ) +HB_FUNC_TRANSLATE( INETGETPERIODCALLBACK , HB_INETPERIODCALLBACK ) +HB_FUNC_TRANSLATE( INETCLEARPERIODCALLBACK , HB_INETCLEARPERIODCALLBACK ) +HB_FUNC_TRANSLATE( INETRECV , HB_INETRECV ) +HB_FUNC_TRANSLATE( INETRECVALL , HB_INETRECVALL ) +HB_FUNC_TRANSLATE( INETRECVLINE , HB_INETRECVLINE ) +HB_FUNC_TRANSLATE( INETRECVENDBLOCK , HB_INETRECVENDBLOCK ) +HB_FUNC_TRANSLATE( INETDATAREADY , HB_INETDATAREADY ) +HB_FUNC_TRANSLATE( INETSEND , HB_INETSEND ) +HB_FUNC_TRANSLATE( INETSENDALL , HB_INETSENDALL ) +HB_FUNC_TRANSLATE( INETGETHOSTS , HB_INETGETHOSTS ) +HB_FUNC_TRANSLATE( INETGETALIAS , HB_INETGETALIAS ) +HB_FUNC_TRANSLATE( INETSERVER , HB_INETSERVER ) +HB_FUNC_TRANSLATE( INETACCEPT , HB_INETACCEPT ) +HB_FUNC_TRANSLATE( INETCONNECT , HB_INETCONNECT ) +HB_FUNC_TRANSLATE( INETCONNECTIP , HB_INETCONNECTIP ) +HB_FUNC_TRANSLATE( INETDGRAMBIND , HB_INETDGRAMBIND ) +HB_FUNC_TRANSLATE( INETDGRAM , HB_INETDGRAM ) +HB_FUNC_TRANSLATE( INETDGRAMSEND , HB_INETDGRAMSEND ) +HB_FUNC_TRANSLATE( INETDGRAMRECV , HB_INETDGRAMRECV ) +HB_FUNC_TRANSLATE( INETCRLF , HB_INETCRLF ) +HB_FUNC_TRANSLATE( INETISSOCKET , HB_INETISSOCKET ) diff --git a/harbour/contrib/xhb/xhbini.c b/harbour/contrib/xhb/xhbini.c index c58a0b1b08..1b58c6a33d 100644 --- a/harbour/contrib/xhb/xhbini.c +++ b/harbour/contrib/xhb/xhbini.c @@ -52,6 +52,6 @@ #include "hbapi.h" -HB_FUNC_EXTERN( HB_INISETCOMMENT ) ; HB_FUNC( HB_SETINICOMMENT ) { HB_FUNC_EXEC( HB_INISETCOMMENT ); } -HB_FUNC_EXTERN( HB_INIREAD ) ; HB_FUNC( HB_READINI ) { HB_FUNC_EXEC( HB_INIREAD ); } -HB_FUNC_EXTERN( HB_INIWRITE ) ; HB_FUNC( HB_WRITEINI ) { HB_FUNC_EXEC( HB_INIWRITE ); } +HB_FUNC_TRANSLATE( HB_SETINICOMMENT , HB_INISETCOMMENT ) +HB_FUNC_TRANSLATE( HB_READINI , HB_INIREAD ) +HB_FUNC_TRANSLATE( HB_WRITEINI , HB_INIWRITE ) diff --git a/harbour/contrib/xhb/xhbmtc.c b/harbour/contrib/xhb/xhbmtc.c index c9db24ae4b..0ef23d786e 100644 --- a/harbour/contrib/xhb/xhbmtc.c +++ b/harbour/contrib/xhb/xhbmtc.c @@ -53,21 +53,21 @@ #include "hbapi.h" /* MT functions */ -HB_FUNC_EXTERN( HB_MTVM ) ; HB_FUNC( HB_MULTITHREAD ) { HB_FUNC_EXEC( HB_MTVM ); } -HB_FUNC_EXTERN( HB_THREADSELF ) ; HB_FUNC( GETCURRENTTHREAD ) { HB_FUNC_EXEC( HB_THREADSELF ); } -HB_FUNC_EXTERN( HB_THREADID ) ; HB_FUNC( GETTHREADID ) { HB_FUNC_EXEC( HB_THREADID ); } -HB_FUNC_EXTERN( HB_THREADID ) ; HB_FUNC( THREADGETCURRENTINTERNAL ) { HB_FUNC_EXEC( HB_THREADID ); } -HB_FUNC_EXTERN( HB_THREADJOIN ) ; HB_FUNC( JOINTHREAD ) { HB_FUNC_EXEC( HB_THREADJOIN ); } -HB_FUNC_EXTERN( HB_THREADTERMINATEALL ) ; HB_FUNC( KILLALLTHREADS ) { HB_FUNC_EXEC( HB_THREADTERMINATEALL ); } -HB_FUNC_EXTERN( HB_THREADWAITFORALL ) ; HB_FUNC( WAITFORTHREADS ) { HB_FUNC_EXEC( HB_THREADWAITFORALL ); } +HB_FUNC_TRANSLATE( HB_MULTITHREAD , HB_MTVM ) +HB_FUNC_TRANSLATE( GETCURRENTTHREAD , HB_THREADSELF ) +HB_FUNC_TRANSLATE( GETTHREADID , HB_THREADID ) +HB_FUNC_TRANSLATE( THREADGETCURRENTINTERNAL , HB_THREADID ) +HB_FUNC_TRANSLATE( JOINTHREAD , HB_THREADJOIN ) +HB_FUNC_TRANSLATE( KILLALLTHREADS , HB_THREADTERMINATEALL ) +HB_FUNC_TRANSLATE( WAITFORTHREADS , HB_THREADWAITFORALL ) -HB_FUNC_EXTERN( HB_MUTEXNOTIFY ) ; HB_FUNC( NOTIFY ) { HB_FUNC_EXEC( HB_MUTEXNOTIFY ); } -HB_FUNC_EXTERN( HB_MUTEXNOTIFYALL ) ; HB_FUNC( NOTIFYALL ) { HB_FUNC_EXEC( HB_MUTEXNOTIFYALL ); } +HB_FUNC_TRANSLATE( NOTIFY , HB_MUTEXNOTIFY ) +HB_FUNC_TRANSLATE( NOTIFYALL , HB_MUTEXNOTIFYALL ) /* not possible to well replicate xHarbour behavior because it's buggy these function results are different on different platform, chosen translation which returns compatible types (numeric) */ -HB_FUNC_EXTERN( HB_THREADID ) ; HB_FUNC( THREADGETCURRENT ) { HB_FUNC_EXEC( HB_THREADID ); } +HB_FUNC_TRANSLATE( THREADGETCURRENT , HB_THREADID ) HB_FUNC( DESTROYMUTEX ) { diff --git a/harbour/contrib/xhb/xhbolec.c b/harbour/contrib/xhb/xhbolec.c index 266bf38331..9f36a55075 100644 --- a/harbour/contrib/xhb/xhbolec.c +++ b/harbour/contrib/xhb/xhbolec.c @@ -52,28 +52,13 @@ #include "hbapi.h" -#if ! defined( HB_OS_WIN ) - -HB_FUNC( OLEERROR ) {} -HB_FUNC( OLE2TXTERROR ) {} -HB_FUNC( __OLEPDISP ) {} - -#else +#if defined( HB_OS_WIN ) #include "hbwin.h" #include "hbwinole.h" -HB_FUNC_EXTERN( WIN_OLEERROR ); -HB_FUNC( OLEERROR ) -{ - HB_FUNC_EXEC( WIN_OLEERROR ); -} - -HB_FUNC_EXTERN( WIN_OLEERRORTEXT ); -HB_FUNC( OLE2TXTERROR ) -{ - HB_FUNC_EXEC( WIN_OLEERRORTEXT ); -} +HB_FUNC_TRANSLATE( OLEERROR , WIN_OLEERROR ) +HB_FUNC_TRANSLATE( OLE2TXTERROR , WIN_OLEERRORTEXT ) HB_FUNC( __OLEPDISP ) { @@ -82,4 +67,10 @@ HB_FUNC( __OLEPDISP ) ( IDispatch * ) ( HB_PTRUINT ) hb_parnint( 1 ) ); } -#endif /* HB_OS_WIN */ +#else + +HB_FUNC( OLEERROR ) {} +HB_FUNC( OLE2TXTERROR ) {} +HB_FUNC( __OLEPDISP ) {} + +#endif diff --git a/harbour/contrib/xhb/xhbprn.c b/harbour/contrib/xhb/xhbprn.c index de7f9f1400..59fd5319a8 100644 --- a/harbour/contrib/xhb/xhbprn.c +++ b/harbour/contrib/xhb/xhbprn.c @@ -54,13 +54,13 @@ #if defined( HB_OS_WIN ) -HB_FUNC_EXTERN( WIN_PRINTEREXISTS ) ; HB_FUNC( PRINTEREXISTS ) { HB_FUNC_EXEC( WIN_PRINTEREXISTS ); } -HB_FUNC_EXTERN( WIN_PRINTERGETDEFAULT ) ; HB_FUNC( GETDEFAULTPRINTER ) { HB_FUNC_EXEC( WIN_PRINTERGETDEFAULT ); } -HB_FUNC_EXTERN( WIN_PRINTERSTATUS ) ; HB_FUNC( XISPRINTER ) { HB_FUNC_EXEC( WIN_PRINTERSTATUS ); } -HB_FUNC_EXTERN( WIN_PRINTERPORTTONAME ) ; HB_FUNC( PRINTERPORTTONAME ) { HB_FUNC_EXEC( WIN_PRINTERPORTTONAME ); } -HB_FUNC_EXTERN( WIN_PRINTFILERAW ) ; HB_FUNC( PRINTFILERAW ) { HB_FUNC_EXEC( WIN_PRINTFILERAW ); } -HB_FUNC_EXTERN( WIN_PRINTERLIST ) ; HB_FUNC( GETPRINTERS ) { HB_FUNC_EXEC( WIN_PRINTERLIST ); } -HB_FUNC_EXTERN( WIN_PRINTERSETDEFAULT ) ; HB_FUNC( SETDEFAULTPRINTER ) { HB_FUNC_EXEC( WIN_PRINTERSETDEFAULT ); } +HB_FUNC_TRANSLATE( PRINTEREXISTS , WIN_PRINTEREXISTS ) +HB_FUNC_TRANSLATE( GETDEFAULTPRINTER , WIN_PRINTERGETDEFAULT ) +HB_FUNC_TRANSLATE( XISPRINTER , WIN_PRINTERSTATUS ) +HB_FUNC_TRANSLATE( PRINTERPORTTONAME , WIN_PRINTERPORTTONAME ) +HB_FUNC_TRANSLATE( PRINTFILERAW , WIN_PRINTFILERAW ) +HB_FUNC_TRANSLATE( GETPRINTERS , WIN_PRINTERLIST ) +HB_FUNC_TRANSLATE( SETDEFAULTPRINTER , WIN_PRINTERSETDEFAULT ) #else diff --git a/harbour/contrib/xhb/xhbproc.c b/harbour/contrib/xhb/xhbproc.c index 8f17cabaf0..2018aecc4a 100644 --- a/harbour/contrib/xhb/xhbproc.c +++ b/harbour/contrib/xhb/xhbproc.c @@ -52,5 +52,5 @@ #include "hbapi.h" -HB_FUNC_EXTERN( HB_PROCESSOPEN ) ; HB_FUNC( HB_OPENPROCESS ) { HB_FUNC_EXEC( HB_PROCESSOPEN ); } -HB_FUNC_EXTERN( HB_PROCESSCLOSE ) ; HB_FUNC( HB_CLOSEPROCESS ) { HB_FUNC_EXEC( HB_PROCESSCLOSE ); } +HB_FUNC_TRANSLATE( HB_OPENPROCESS , HB_PROCESSOPEN ) +HB_FUNC_TRANSLATE( HB_CLOSEPROCESS , HB_PROCESSCLOSE ) diff --git a/harbour/contrib/xhb/xhbregx.c b/harbour/contrib/xhb/xhbregx.c index 75b618742e..9b49bfbf83 100644 --- a/harbour/contrib/xhb/xhbregx.c +++ b/harbour/contrib/xhb/xhbregx.c @@ -52,4 +52,4 @@ #include "hbapi.h" -HB_FUNC_EXTERN( HB_ISREGEX ) ; HB_FUNC( HB_ISREGEXSTRING ) { HB_FUNC_EXEC( HB_ISREGEX ); } +HB_FUNC_TRANSLATE( HB_ISREGEXSTRING, HB_ISREGEX ) diff --git a/harbour/contrib/xhb/xhbwin.c b/harbour/contrib/xhb/xhbwin.c index 5181ec5de9..516dcb388d 100644 --- a/harbour/contrib/xhb/xhbwin.c +++ b/harbour/contrib/xhb/xhbwin.c @@ -4,7 +4,7 @@ /* * Harbour Project source code: - * Compatibility calls (MS-Win). + * Compatibility calls (Windows) * * Copyright 2009 Viktor Szakats (harbour syenar.net) * www - http://harbour-project.org @@ -54,35 +54,17 @@ OLE implementation. Please update your code to use this new API, the old one will be removed in a future revision. [vszakats] */ -/* NOTE: Add to this file functions coming from old OLE source only. - [vszakats] */ - #include "hbapi.h" -#if ! defined( HB_OS_WIN ) - -HB_FUNC( ANSITOWIDE ) {} -HB_FUNC( WIDETOANSI ) {} -HB_FUNC( MESSAGEBOX ) {} - -#else +#if defined( HB_OS_WIN ) #include "hbwinuni.h" #include -HB_FUNC_EXTERN( WIN_ANSITOWIDE ); /* Original version may have returned NIL in some error situations. */ -HB_FUNC( ANSITOWIDE ) -{ - HB_FUNC_EXEC( WIN_ANSITOWIDE ); -} - -HB_FUNC_EXTERN( WIN_WIDETOANSI ); +HB_FUNC_TRANSLATE( ANSITOWIDE, WIN_ANSITOWIDE ) /* Original version may have returned NIL in some error situations. */ -HB_FUNC( WIDETOANSI ) -{ - HB_FUNC_EXEC( WIN_WIDETOANSI ); -} +HB_FUNC_TRANSLATE( WIDETOANSI, WIN_WIDETOANSI ) HB_FUNC( MESSAGEBOX ) { @@ -95,4 +77,10 @@ HB_FUNC( MESSAGEBOX ) hb_strfree( hStr2 ); } -#endif /* HB_OS_WIN */ +#else + +HB_FUNC( ANSITOWIDE ) {} +HB_FUNC( WIDETOANSI ) {} +HB_FUNC( MESSAGEBOX ) {} + +#endif diff --git a/harbour/contrib/xhb/xwin_reg.c b/harbour/contrib/xhb/xwin_reg.c index 5df1df092d..8c5b0e9d4f 100644 --- a/harbour/contrib/xhb/xwin_reg.c +++ b/harbour/contrib/xhb/xwin_reg.c @@ -54,9 +54,9 @@ #if defined( HB_OS_WIN ) -HB_FUNC_EXTERN( WIN_REGQUERY ) ; HB_FUNC( QUERYREGISTRY ) { HB_FUNC_EXEC( WIN_REGQUERY ); } -HB_FUNC_EXTERN( WIN_REGGET ) ; HB_FUNC( GETREGISTRY ) { HB_FUNC_EXEC( WIN_REGGET ); } -HB_FUNC_EXTERN( WIN_REGSET ) ; HB_FUNC( SETREGISTRY ) { HB_FUNC_EXEC( WIN_REGSET ); } +HB_FUNC_TRANSLATE( QUERYREGISTRY , WIN_REGQUERY ) +HB_FUNC_TRANSLATE( GETREGISTRY , WIN_REGGET ) +HB_FUNC_TRANSLATE( SETREGISTRY , WIN_REGSET ) #else diff --git a/harbour/contrib/xhb/xwin_ver.c b/harbour/contrib/xhb/xwin_ver.c index ff35c17bdd..83c6934c77 100644 --- a/harbour/contrib/xhb/xwin_ver.c +++ b/harbour/contrib/xhb/xwin_ver.c @@ -54,26 +54,26 @@ #if defined( HB_OS_WIN ) -HB_FUNC_EXTERN( WIN_OSVERSIONINFO ) ; HB_FUNC( OS_VERSIONINFO ) { HB_FUNC_EXEC( WIN_OSVERSIONINFO ); } -HB_FUNC_EXTERN( WIN_OSISNT ) ; HB_FUNC( OS_ISWINNT ) { HB_FUNC_EXEC( WIN_OSISNT ); } -HB_FUNC_EXTERN( WIN_OSISNT351 ) ; HB_FUNC( OS_ISWINNT351 ) { HB_FUNC_EXEC( WIN_OSISNT351 ); } -HB_FUNC_EXTERN( WIN_OSISNT4 ) ; HB_FUNC( OS_ISWINNT4 ) { HB_FUNC_EXEC( WIN_OSISNT4 ); } -HB_FUNC_EXTERN( WIN_OSIS2000ORUPPER ) ; HB_FUNC( OS_ISWIN2000_OR_LATER ) { HB_FUNC_EXEC( WIN_OSIS2000ORUPPER ); } -HB_FUNC_EXTERN( WIN_OSIS2000 ) ; HB_FUNC( OS_ISWIN2000 ) { HB_FUNC_EXEC( WIN_OSIS2000 ); } -HB_FUNC_EXTERN( WIN_OSISXP ) ; HB_FUNC( OS_ISWINXP ) { HB_FUNC_EXEC( WIN_OSISXP ); } -HB_FUNC_EXTERN( WIN_OSISWINXPORUPPER ) ; HB_FUNC( OS_ISWINXP_OR_LATER ) { HB_FUNC_EXEC( WIN_OSISWINXPORUPPER ); } -HB_FUNC_EXTERN( WIN_OSIS2003 ) ; HB_FUNC( OS_ISWIN2003 ) { HB_FUNC_EXEC( WIN_OSIS2003 ); } -HB_FUNC_EXTERN( WIN_OSISVISTA ) ; HB_FUNC( OS_ISWINVISTA ) { HB_FUNC_EXEC( WIN_OSISVISTA ); } -HB_FUNC_EXTERN( WIN_OSISVISTAORUPPER ) ; HB_FUNC( OS_ISWINVISTA_OR_LATER ) { HB_FUNC_EXEC( WIN_OSISVISTAORUPPER ); } -HB_FUNC_EXTERN( WIN_OSIS7 ) ; HB_FUNC( OS_ISWIN7 ) { HB_FUNC_EXEC( WIN_OSIS7 ); } -HB_FUNC_EXTERN( WIN_OSIS8 ) ; HB_FUNC( OS_ISWIN8 ) { HB_FUNC_EXEC( WIN_OSIS8 ); } -HB_FUNC_EXTERN( WIN_OSIS9X ) ; HB_FUNC( OS_ISWIN9X ) { HB_FUNC_EXEC( WIN_OSIS9X ); } -HB_FUNC_EXTERN( WIN_OSIS95 ) ; HB_FUNC( OS_ISWIN95 ) { HB_FUNC_EXEC( WIN_OSIS95 ); } -HB_FUNC_EXTERN( WIN_OSIS98 ) ; HB_FUNC( OS_ISWIN98 ) { HB_FUNC_EXEC( WIN_OSIS98 ); } -HB_FUNC_EXTERN( WIN_OSISME ) ; HB_FUNC( OS_ISWINME ) { HB_FUNC_EXEC( WIN_OSISME ); } -HB_FUNC_EXTERN( WIN_OSISTSCLIENT ) ; HB_FUNC( OS_ISWTSCLIENT ) { HB_FUNC_EXEC( WIN_OSISTSCLIENT ); } -HB_FUNC_EXTERN( WIN_OSNETREGOK ) ; HB_FUNC( OS_NETREGOK ) { HB_FUNC_EXEC( WIN_OSNETREGOK ); } -HB_FUNC_EXTERN( WIN_OSNETVREDIROK ) ; HB_FUNC( OS_NETVREDIROK ) { HB_FUNC_EXEC( WIN_OSNETVREDIROK ); } +HB_FUNC_TRANSLATE( OS_VERSIONINFO , WIN_OSVERSIONINFO ) +HB_FUNC_TRANSLATE( OS_ISWINNT , WIN_OSISNT ) +HB_FUNC_TRANSLATE( OS_ISWINNT351 , WIN_OSISNT351 ) +HB_FUNC_TRANSLATE( OS_ISWINNT4 , WIN_OSISNT4 ) +HB_FUNC_TRANSLATE( OS_ISWIN2000_OR_LATER , WIN_OSIS2000ORUPPER ) +HB_FUNC_TRANSLATE( OS_ISWIN2000 , WIN_OSIS2000 ) +HB_FUNC_TRANSLATE( OS_ISWINXP , WIN_OSISXP ) +HB_FUNC_TRANSLATE( OS_ISWINXP_OR_LATER , WIN_OSISWINXPORUPPER ) +HB_FUNC_TRANSLATE( OS_ISWIN2003 , WIN_OSIS2003 ) +HB_FUNC_TRANSLATE( OS_ISWINVISTA , WIN_OSISVISTA ) +HB_FUNC_TRANSLATE( OS_ISWINVISTA_OR_LATER , WIN_OSISVISTAORUPPER ) +HB_FUNC_TRANSLATE( OS_ISWIN7 , WIN_OSIS7 ) +HB_FUNC_TRANSLATE( OS_ISWIN8 , WIN_OSIS8 ) +HB_FUNC_TRANSLATE( OS_ISWIN9X , WIN_OSIS9X ) +HB_FUNC_TRANSLATE( OS_ISWIN95 , WIN_OSIS95 ) +HB_FUNC_TRANSLATE( OS_ISWIN98 , WIN_OSIS98 ) +HB_FUNC_TRANSLATE( OS_ISWINME , WIN_OSISME ) +HB_FUNC_TRANSLATE( OS_ISWTSCLIENT , WIN_OSISTSCLIENT ) +HB_FUNC_TRANSLATE( OS_NETREGOK , WIN_OSNETREGOK ) +HB_FUNC_TRANSLATE( OS_NETVREDIROK , WIN_OSNETVREDIROK ) #else diff --git a/harbour/src/rdd/dbcmdhb.c b/harbour/src/rdd/dbcmdhb.c index adcdfee223..d727bc2bc9 100644 --- a/harbour/src/rdd/dbcmdhb.c +++ b/harbour/src/rdd/dbcmdhb.c @@ -52,16 +52,5 @@ #include "hbapi.h" -HB_FUNC_EXTERN( __DBPACK ); - -HB_FUNC( HB_DBPACK ) -{ - HB_FUNC_EXEC( __DBPACK ); -} - -HB_FUNC_EXTERN( __DBZAP ); - -HB_FUNC( HB_DBZAP ) -{ - HB_FUNC_EXEC( __DBZAP ); -} +HB_FUNC_TRANSLATE( HB_DBPACK, __DBPACK ) +HB_FUNC_TRANSLATE( HB_DBZAP, __DBZAP ) diff --git a/harbour/src/rdd/dbdrop.c b/harbour/src/rdd/dbdrop.c index ae160182ed..85afdb86a6 100644 --- a/harbour/src/rdd/dbdrop.c +++ b/harbour/src/rdd/dbdrop.c @@ -59,11 +59,6 @@ original CA-Cl*pper namespace. This should have been marked as HB_EXTENSION, but it's not. */ -HB_FUNC_EXTERN( HB_DBDROP ); - -HB_FUNC( DBDROP ) -{ - HB_FUNC_EXEC( HB_DBDROP ); -} +HB_FUNC_TRANSLATE( DBDROP, HB_DBDROP ) #endif diff --git a/harbour/src/rdd/dbexists.c b/harbour/src/rdd/dbexists.c index e49cdd42aa..480d2cf707 100644 --- a/harbour/src/rdd/dbexists.c +++ b/harbour/src/rdd/dbexists.c @@ -59,11 +59,6 @@ original CA-Cl*pper namespace. This should have been marked as HB_EXTENSION, but it's not. */ -HB_FUNC_EXTERN( HB_DBEXISTS ); - -HB_FUNC( DBEXISTS ) -{ - HB_FUNC_EXEC( HB_DBEXISTS ); -} +HB_FUNC_TRANSLATE( DBEXISTS, HB_DBEXISTS ) #endif diff --git a/harbour/src/rdd/dbnubs.c b/harbour/src/rdd/dbnubs.c index 5de8d2faba..1a30eafb58 100644 --- a/harbour/src/rdd/dbnubs.c +++ b/harbour/src/rdd/dbnubs.c @@ -54,151 +54,31 @@ #ifdef HB_CLP_UNDOC -HB_FUNC_EXTERN( DBSEEK ); -HB_FUNC_EXTERN( DBSKIP ); -HB_FUNC_EXTERN( DBGOTOP ); -HB_FUNC_EXTERN( DBGOBOTTOM ); -HB_FUNC_EXTERN( DBGOTO ); -HB_FUNC_EXTERN( DBAPPEND ); -HB_FUNC_EXTERN( DBDELETE ); -HB_FUNC_EXTERN( DBRECALL ); -HB_FUNC_EXTERN( DBCOMMITALL ); -HB_FUNC_EXTERN( DBUNLOCK ); -HB_FUNC_EXTERN( DBUNLOCKALL ); -HB_FUNC_EXTERN( DBSETFILTER ); -HB_FUNC_EXTERN( DBCLEARRELATION ); -HB_FUNC_EXTERN( DBSETRELATION ); -HB_FUNC_EXTERN( DBREINDEX ); -HB_FUNC_EXTERN( DBCREATEINDEX ); -HB_FUNC_EXTERN( DBCLEARINDEX ); -HB_FUNC_EXTERN( DBSETINDEX ); -HB_FUNC_EXTERN( DBSETORDER ); -HB_FUNC_EXTERN( DBCLOSEALL ); -HB_FUNC_EXTERN( DBCLOSEAREA ); -HB_FUNC_EXTERN( DBUSEAREA ); -HB_FUNC_EXTERN( DBSELECTAREA ); - -HB_FUNC( __DBSEEK ) -{ - HB_FUNC_EXEC( DBSEEK ); -} - -HB_FUNC( __DBSKIP ) -{ - HB_FUNC_EXEC( DBSKIP ); -} - -HB_FUNC( __DBGOTOP ) -{ - HB_FUNC_EXEC( DBGOTOP ); -} - -HB_FUNC( __DBGOBOTTOM ) -{ - HB_FUNC_EXEC( DBGOBOTTOM ); -} - -HB_FUNC( __DBGOTO ) -{ - HB_FUNC_EXEC( DBGOTO ); -} - -HB_FUNC( __DBAPPEND ) -{ - HB_FUNC_EXEC( DBAPPEND ); -} - -HB_FUNC( __DBDELETE ) -{ - HB_FUNC_EXEC( DBDELETE ); -} - -HB_FUNC( __DBRECALL ) -{ - HB_FUNC_EXEC( DBRECALL ); -} - +HB_FUNC_TRANSLATE( __DBSEEK, DBSEEK ) +HB_FUNC_TRANSLATE( __DBSKIP, DBSKIP ) +HB_FUNC_TRANSLATE( __DBGOTOP, DBGOTOP ) +HB_FUNC_TRANSLATE( __DBGOBOTTOM, DBGOBOTTOM ) +HB_FUNC_TRANSLATE( __DBGOTO, DBGOTO ) +HB_FUNC_TRANSLATE( __DBAPPEND, DBAPPEND ) +HB_FUNC_TRANSLATE( __DBDELETE, DBDELETE ) +HB_FUNC_TRANSLATE( __DBRECALL, DBRECALL ) /* NOTE: Clipper does exactly that, __dbCommit() will call dbCommitAll() This may be a bug. */ - -HB_FUNC( __DBCOMMIT ) -{ - HB_FUNC_EXEC( DBCOMMITALL ); -} - -HB_FUNC( __DBCOMMITALL ) -{ - HB_FUNC_EXEC( DBCOMMITALL ); -} - -HB_FUNC( __DBUNLOCK ) -{ - HB_FUNC_EXEC( DBUNLOCK ); -} - -HB_FUNC( __DBUNLALL ) -{ - HB_FUNC_EXEC( DBUNLOCKALL ); -} - -HB_FUNC( __DBSETFILTER ) -{ - HB_FUNC_EXEC( DBSETFILTER ); -} - -HB_FUNC( __DBCLEARRELATION ) -{ - HB_FUNC_EXEC( DBCLEARRELATION ); -} - -HB_FUNC( __DBSETRELATION ) -{ - HB_FUNC_EXEC( DBSETRELATION ); -} - -HB_FUNC( __DBREINDEX ) -{ - HB_FUNC_EXEC( DBREINDEX ); -} - -HB_FUNC( __DBCREATINDEX ) -{ - HB_FUNC_EXEC( DBCREATEINDEX ); -} - -HB_FUNC( __DBCLEARINDEX ) -{ - HB_FUNC_EXEC( DBCLEARINDEX ); -} - -HB_FUNC( __DBSETINDEX ) -{ - HB_FUNC_EXEC( DBSETINDEX ); -} - -HB_FUNC( __DBSETORDER ) -{ - HB_FUNC_EXEC( DBSETORDER ); -} - -HB_FUNC( __DBCLOSEAREA ) -{ - HB_FUNC_EXEC( DBCLOSEALL ); -} - -HB_FUNC( __DBCLOSE ) -{ - HB_FUNC_EXEC( DBCLOSEAREA ); -} - -HB_FUNC( __DBUSE ) -{ - HB_FUNC_EXEC( DBUSEAREA ); -} - -HB_FUNC( __DBSELECT ) -{ - HB_FUNC_EXEC( DBSELECTAREA ); -} +HB_FUNC_TRANSLATE( __DBCOMMIT, DBCOMMITALL ) +HB_FUNC_TRANSLATE( __DBCOMMITALL, DBCOMMITALL ) +HB_FUNC_TRANSLATE( __DBUNLOCK, DBUNLOCK ) +HB_FUNC_TRANSLATE( __DBUNLALL, DBUNLOCKALL ) +HB_FUNC_TRANSLATE( __DBSETFILTER, DBSETFILTER ) +HB_FUNC_TRANSLATE( __DBCLEARRELATION, DBCLEARRELATION ) +HB_FUNC_TRANSLATE( __DBSETRELATION, DBSETRELATION ) +HB_FUNC_TRANSLATE( __DBREINDEX, DBREINDEX ) +HB_FUNC_TRANSLATE( __DBCREATINDEX, DBCREATEINDEX ) +HB_FUNC_TRANSLATE( __DBCLEARINDEX, DBCLEARINDEX ) +HB_FUNC_TRANSLATE( __DBSETINDEX, DBSETINDEX ) +HB_FUNC_TRANSLATE( __DBSETORDER, DBSETORDER ) +HB_FUNC_TRANSLATE( __DBCLOSEAREA, DBCLOSEALL ) +HB_FUNC_TRANSLATE( __DBCLOSE, DBCLOSEAREA ) +HB_FUNC_TRANSLATE( __DBUSE, DBUSEAREA ) +HB_FUNC_TRANSLATE( __DBSELECT, DBSELECTAREA ) #endif diff --git a/harbour/src/rdd/dbrename.c b/harbour/src/rdd/dbrename.c index 3101e511c8..b098e344d0 100644 --- a/harbour/src/rdd/dbrename.c +++ b/harbour/src/rdd/dbrename.c @@ -58,11 +58,6 @@ original CA-Cl*pper namespace. This should have been marked as HB_EXTENSION, but it's not. */ -HB_FUNC_EXTERN( HB_DBRENAME ); - -HB_FUNC( DBRENAME ) -{ - HB_FUNC_EXEC( HB_DBRENAME ); -} +HB_FUNC_TRANSLATE( DBRENAME, HB_DBRENAME ) #endif diff --git a/harbour/src/rdd/fieldhb.c b/harbour/src/rdd/fieldhb.c index 61d4bedf76..8730042e86 100644 --- a/harbour/src/rdd/fieldhb.c +++ b/harbour/src/rdd/fieldhb.c @@ -59,25 +59,8 @@ original CA-Cl*pper namespace. These should have been marked as HB_EXTENSION, but they're not. */ -HB_FUNC_EXTERN( HB_FIELDLEN ); - -HB_FUNC( FIELDLEN ) -{ - HB_FUNC_EXEC( HB_FIELDLEN ); -} - -HB_FUNC_EXTERN( HB_FIELDDEC ); - -HB_FUNC( FIELDDEC ) -{ - HB_FUNC_EXEC( HB_FIELDDEC ); -} - -HB_FUNC_EXTERN( HB_FIELDTYPE ); - -HB_FUNC( FIELDTYPE ) -{ - HB_FUNC_EXEC( HB_FIELDTYPE ); -} +HB_FUNC_TRANSLATE( FIELDLEN, HB_FIELDLEN ) +HB_FUNC_TRANSLATE( FIELDDEC, HB_FIELDDEC ) +HB_FUNC_TRANSLATE( FIELDTYPE, HB_FIELDTYPE ) #endif diff --git a/harbour/src/rdd/hbsix/sxredir.c b/harbour/src/rdd/hbsix/sxredir.c index 45e367634c..61d06907f4 100644 --- a/harbour/src/rdd/hbsix/sxredir.c +++ b/harbour/src/rdd/hbsix/sxredir.c @@ -55,25 +55,6 @@ #include "hbapi.h" -HB_FUNC_EXTERN( ORDFINDREC ); - -HB_FUNC( SX_FINDREC ) -{ - HB_FUNC_EXEC( ORDFINDREC ); -} - - -HB_FUNC_EXTERN( ORDBAGCLEAR ); - -HB_FUNC( SX_CLEARORDER ) -{ - HB_FUNC_EXEC( ORDBAGCLEAR ); -} - - -HB_FUNC_EXTERN( SX_SETTRIGGER ); - -HB_FUNC( SX_SETTRIG ) -{ - HB_FUNC_EXEC( SX_SETTRIGGER ); -} +HB_FUNC_TRANSLATE( SX_FINDREC , ORDFINDREC ) +HB_FUNC_TRANSLATE( SX_CLEARORDER, ORDBAGCLEAR ) +HB_FUNC_TRANSLATE( SX_SETTRIG , SX_SETTRIGGER ) diff --git a/harbour/src/rdd/hsx/cftsfunc.c b/harbour/src/rdd/hsx/cftsfunc.c index 4f556093ac..2ec1163ad2 100644 --- a/harbour/src/rdd/hsx/cftsfunc.c +++ b/harbour/src/rdd/hsx/cftsfunc.c @@ -59,81 +59,16 @@ #include "hbapi.h" -HB_FUNC_EXTERN( HS_ADD ); -HB_FUNC_EXTERN( HS_CLOSE ); -HB_FUNC_EXTERN( HS_CREATE ); -HB_FUNC_EXTERN( HS_DELETE ); -HB_FUNC_EXTERN( HS_IFDEL ); -HB_FUNC_EXTERN( HS_NEXT ); -HB_FUNC_EXTERN( HS_OPEN ); -HB_FUNC_EXTERN( HS_KEYCOUNT ); -HB_FUNC_EXTERN( HS_REPLACE ); -HB_FUNC_EXTERN( HS_SET ); -HB_FUNC_EXTERN( HS_UNDELETE ); -HB_FUNC_EXTERN( HS_VERIFY ); -HB_FUNC_EXTERN( HS_VERSION ); - -HB_FUNC( CFTSADD ) -{ - HB_FUNC_EXEC( HS_ADD ); -} - -HB_FUNC( CFTSCLOSE ) -{ - HB_FUNC_EXEC( HS_CLOSE ); -} - -HB_FUNC( CFTSCREA ) -{ - HB_FUNC_EXEC( HS_CREATE ); -} - -HB_FUNC( CFTSDELETE ) -{ - HB_FUNC_EXEC( HS_DELETE ); -} - -HB_FUNC( CFTSIFDEL ) -{ - HB_FUNC_EXEC( HS_IFDEL ); -} - -HB_FUNC( CFTSNEXT ) -{ - HB_FUNC_EXEC( HS_NEXT ); -} - -HB_FUNC( CFTSOPEN ) -{ - HB_FUNC_EXEC( HS_OPEN ); -} - -HB_FUNC( CFTSRECN ) -{ - HB_FUNC_EXEC( HS_KEYCOUNT ); -} - -HB_FUNC( CFTSREPLAC ) -{ - HB_FUNC_EXEC( HS_REPLACE ); -} - -HB_FUNC( CFTSSET ) -{ - HB_FUNC_EXEC( HS_SET ); -} - -HB_FUNC( CFTSUNDEL ) -{ - HB_FUNC_EXEC( HS_UNDELETE ); -} - -HB_FUNC( CFTSVERI ) -{ - HB_FUNC_EXEC( HS_VERIFY ); -} - -HB_FUNC( CFTSVERS ) -{ - HB_FUNC_EXEC( HS_VERSION ); -} +HB_FUNC_TRANSLATE( CFTSADD , HS_ADD ) +HB_FUNC_TRANSLATE( CFTSCLOSE , HS_CLOSE ) +HB_FUNC_TRANSLATE( CFTSCREA , HS_CREATE ) +HB_FUNC_TRANSLATE( CFTSDELETE, HS_DELETE ) +HB_FUNC_TRANSLATE( CFTSIFDEL , HS_IFDEL ) +HB_FUNC_TRANSLATE( CFTSNEXT , HS_NEXT ) +HB_FUNC_TRANSLATE( CFTSOPEN , HS_OPEN ) +HB_FUNC_TRANSLATE( CFTSRECN , HS_KEYCOUNT ) +HB_FUNC_TRANSLATE( CFTSREPLAC, HS_REPLACE ) +HB_FUNC_TRANSLATE( CFTSSET , HS_SET ) +HB_FUNC_TRANSLATE( CFTSUNDEL , HS_UNDELETE ) +HB_FUNC_TRANSLATE( CFTSVERI , HS_VERIFY ) +HB_FUNC_TRANSLATE( CFTSVERS , HS_VERSION ) diff --git a/harbour/src/rdd/rddinfo.c b/harbour/src/rdd/rddinfo.c index 883a99207b..47605782d7 100644 --- a/harbour/src/rdd/rddinfo.c +++ b/harbour/src/rdd/rddinfo.c @@ -55,15 +55,10 @@ #ifndef HB_CLP_STRICT -HB_FUNC_EXTERN( HB_RDDINFO ); - /* NOTE: This function is a new Harbour function implemented in the original CA-Cl*pper namespace. This should have been marked as HB_EXTENSION, but it's not. */ -HB_FUNC( RDDINFO ) -{ - HB_FUNC_EXEC( HB_RDDINFO ) -} +HB_FUNC_TRANSLATE( RDDINFO, HB_RDDINFO ) #endif diff --git a/harbour/src/rtl/cdpapihb.c b/harbour/src/rtl/cdpapihb.c index d4183c8067..3ab52b2f76 100644 --- a/harbour/src/rtl/cdpapihb.c +++ b/harbour/src/rtl/cdpapihb.c @@ -552,9 +552,4 @@ HB_FUNC( HB_UTF8LEN ) * character position in string so we do not need to create new * HB_UTF8STRTRAN() but we can safely use normal STRTRAN() function */ -HB_FUNC_EXTERN( STRTRAN ); - -HB_FUNC( HB_UTF8STRTRAN ) -{ - HB_FUNC_EXEC( STRTRAN ) -} +HB_FUNC_TRANSLATE( HB_UTF8STRTRAN, STRTRAN ) diff --git a/harbour/src/rtl/defpathu.c b/harbour/src/rtl/defpathu.c index 15a2d29c38..e9c4b5f910 100644 --- a/harbour/src/rtl/defpathu.c +++ b/harbour/src/rtl/defpathu.c @@ -54,11 +54,6 @@ #ifdef HB_CLP_UNDOC -HB_FUNC_EXTERN( __DEFPATH ); - -HB_FUNC( DEFPATH ) -{ - HB_FUNC_EXEC( __DEFPATH ); -} +HB_FUNC_TRANSLATE( DEFPATH, __DEFPATH ) #endif diff --git a/harbour/src/rtl/errapiu.c b/harbour/src/rtl/errapiu.c index f05836a17d..39e5c8b15c 100644 --- a/harbour/src/rtl/errapiu.c +++ b/harbour/src/rtl/errapiu.c @@ -54,16 +54,7 @@ #ifdef HB_CLP_UNDOC -HB_FUNC_EXTERN( __ERRINHANDLER ); - -HB_FUNC( ERRORINHAN ) -{ - HB_FUNC_EXEC( __ERRINHANDLER ) -} - -HB_FUNC( ERRORINHANDLER ) -{ - HB_FUNC_EXEC( __ERRINHANDLER ) -} +HB_FUNC_TRANSLATE( ERRORINHAN, __ERRINHANDLER ) +HB_FUNC_TRANSLATE( ERRORINHANDLER, __ERRINHANDLER ) #endif diff --git a/harbour/src/rtl/natmsgu.c b/harbour/src/rtl/natmsgu.c index cb9918c791..ebd6644e6d 100644 --- a/harbour/src/rtl/natmsgu.c +++ b/harbour/src/rtl/natmsgu.c @@ -66,45 +66,12 @@ #ifdef HB_CLP_UNDOC -HB_FUNC_EXTERN( __NATISAFFIRM ); - -HB_FUNC( ISAFFIRM ) -{ - HB_FUNC_EXEC( __NATISAFFIRM ) -} - -HB_FUNC_EXTERN( __NATISNEGATIVE ); - -HB_FUNC( ISNEGATIVE ) -{ - HB_FUNC_EXEC( __NATISNEGATIVE ) -} - -HB_FUNC_EXTERN( __NATMSG ); - -HB_FUNC( NATIONMSG ) -{ - HB_FUNC_EXEC( __NATMSG ) -} - -/* NOTE: Intentionally using one leading underscore, like in Clipper. - [vszakats] */ - -HB_FUNC_EXTERN( __NATSORTVER ); - -HB_FUNC( _NATSORTVER ) -{ - HB_FUNC_EXEC( __NATSORTVER ) -} - -/* NOTE: Intentionally using one leading underscore, like in Clipper. - [vszakats] */ - -HB_FUNC_EXTERN( __NATMSGVER ); - -HB_FUNC( _NATMSGVER ) -{ - HB_FUNC_EXEC( __NATMSGVER ) -} +HB_FUNC_TRANSLATE( ISAFFIRM, __NATISAFFIRM ) +HB_FUNC_TRANSLATE( ISNEGATIVE, __NATISNEGATIVE ) +HB_FUNC_TRANSLATE( NATIONMSG, __NATMSG ) +/* NOTE: Intentionally using one leading underscore, like in Clipper. [vszakats] */ +HB_FUNC_TRANSLATE( _NATSORTVER, __NATSORTVER ) +/* NOTE: Intentionally using one leading underscore, like in Clipper. [vszakats] */ +HB_FUNC_TRANSLATE( _NATMSGVER, __NATMSGVER ) #endif diff --git a/harbour/src/rtl/pad.c b/harbour/src/rtl/pad.c index a7e476b8df..8bbc99c72b 100644 --- a/harbour/src/rtl/pad.c +++ b/harbour/src/rtl/pad.c @@ -52,10 +52,5 @@ #include "hbapi.h" -HB_FUNC_EXTERN( PADR ); - /* synonymn for PADR */ -HB_FUNC( PAD ) -{ - HB_FUNC_EXEC( PADR ); -} +HB_FUNC_TRANSLATE( PAD, PADR ) diff --git a/harbour/src/rtl/shadowu.c b/harbour/src/rtl/shadowu.c index d3917e192d..7494369ae4 100644 --- a/harbour/src/rtl/shadowu.c +++ b/harbour/src/rtl/shadowu.c @@ -54,11 +54,6 @@ #ifdef HB_CLP_UNDOC -HB_FUNC_EXTERN( HB_SHADOW ); - -HB_FUNC( DBGSHADOW ) -{ - HB_FUNC_EXEC( HB_SHADOW ); -} +HB_FUNC_TRANSLATE( DBGSHADOW, HB_SHADOW ) #endif diff --git a/harbour/src/vm/memvclip.c b/harbour/src/vm/memvclip.c index e6a6321333..fba2f82858 100644 --- a/harbour/src/vm/memvclip.c +++ b/harbour/src/vm/memvclip.c @@ -52,17 +52,12 @@ #include "hbapi.h" -HB_FUNC_EXTERN( __MVPUBLIC ); -HB_FUNC_EXTERN( __MVCLEAR ); -HB_FUNC_EXTERN( __MVRELEASE ); -HB_FUNC_EXTERN( __MVXRELEASE ); -HB_FUNC_EXTERN( __MVSAVE ); -HB_FUNC_EXTERN( __MVRESTORE ); - /* NOTE: Undocumented Clipper internal function. */ #ifdef HB_CLP_UNDOC +HB_FUNC_EXTERN( __MVPUBLIC ); + HB_FUNC( __QQPUB ) { /* In Clipper __QQPUB function does not check number of parameters @@ -78,27 +73,8 @@ HB_FUNC( __QQPUB ) /* CA-Cl*pper 5.2e compatibility functions. */ -HB_FUNC( __MCLEAR ) -{ - HB_FUNC_EXEC( __MVCLEAR ); -} - -HB_FUNC( __MRELEASE ) -{ - HB_FUNC_EXEC( __MVRELEASE ); -} - -HB_FUNC( __MXRELEASE ) -{ - HB_FUNC_EXEC( __MVXRELEASE ); -} - -HB_FUNC( __MSAVE ) -{ - HB_FUNC_EXEC( __MVSAVE ); -} - -HB_FUNC( __MRESTORE ) -{ - HB_FUNC_EXEC( __MVRESTORE ); -} +HB_FUNC_TRANSLATE( __MCLEAR , __MVCLEAR ) +HB_FUNC_TRANSLATE( __MRELEASE , __MVRELEASE ) +HB_FUNC_TRANSLATE( __MXRELEASE, __MVXRELEASE ) +HB_FUNC_TRANSLATE( __MSAVE , __MVSAVE ) +HB_FUNC_TRANSLATE( __MRESTORE , __MVRESTORE )