diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 55710072d7..8a7780c2f0 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,159 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-12-09 15:30 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) + * harbour/include/hbapilng.h + + harbour/include/hbmsgreg.h + + added common for all Harbour lang modules (msg*.c) header file + with initialization code + + * harbour/src/lang/msgbe866.c + * harbour/src/lang/msgbewin.c + * harbour/src/lang/msgbg866.c + * harbour/src/lang/msgbgiso.c + * harbour/src/lang/msgbgmik.c + * harbour/src/lang/msgbgwin.c + * harbour/src/lang/msgca.c + * harbour/src/lang/msgcs852.c + * harbour/src/lang/msgcsiso.c + * harbour/src/lang/msgcskam.c + * harbour/src/lang/msgcswin.c + * harbour/src/lang/msgde.c + * harbour/src/lang/msgdewin.c + * harbour/src/lang/msgel.c + * harbour/src/lang/msgelwin.c + * harbour/src/lang/msgeo.c + * harbour/src/lang/msges.c + * harbour/src/lang/msgeswin.c + * harbour/src/lang/msgeu.c + * harbour/src/lang/msgfr.c + * harbour/src/lang/msggl.c + * harbour/src/lang/msghe862.c + * harbour/src/lang/msghewin.c + * harbour/src/lang/msghr437.c + * harbour/src/lang/msghr852.c + * harbour/src/lang/msghriso.c + * harbour/src/lang/msghrwin.c + * harbour/src/lang/msghu852.c + * harbour/src/lang/msghucwi.c + * harbour/src/lang/msghuiso.c + * harbour/src/lang/msghuwin.c + * harbour/src/lang/msgid.c + * harbour/src/lang/msgis850.c + * harbour/src/lang/msgit.c + * harbour/src/lang/msgko.c + * harbour/src/lang/msgltwin.c + * harbour/src/lang/msgnl.c + * harbour/src/lang/msgpl852.c + * harbour/src/lang/msgpliso.c + * harbour/src/lang/msgplmaz.c + * harbour/src/lang/msgplwin.c + * harbour/src/lang/msgpt.c + * harbour/src/lang/msgptiso.c + * harbour/src/lang/msgro.c + * harbour/src/lang/msgru866.c + * harbour/src/lang/msgrukoi.c + * harbour/src/lang/msgruwin.c + * harbour/src/lang/msgsk852.c + * harbour/src/lang/msgskiso.c + * harbour/src/lang/msgskkam.c + * harbour/src/lang/msgskwin.c + * harbour/src/lang/msgsl437.c + * harbour/src/lang/msgsl852.c + * harbour/src/lang/msgsliso.c + * harbour/src/lang/msgslwin.c + * harbour/src/lang/msgsr852.c + * harbour/src/lang/msgsriso.c + * harbour/src/lang/msgsrwin.c + * harbour/src/lang/msg_tpl.c + * harbour/src/lang/msgtr857.c + * harbour/src/lang/msgtrwin.c + * harbour/src/lang/msgua866.c + * harbour/src/lang/msguados.c + * harbour/src/lang/msguakoi.c + * harbour/src/lang/msguawin.c + * harbour/src/lang/msgzhb5.c + * harbour/src/lang/msgzhgb.c + * modified to use initialization code defined in common for all + lang modules header file. + + * harbour/contrib/gtwvg/wvggui.c + * harbour/contrib/hbqt/qtgui/QApplication.cpp + * harbour/contrib/hbqt/qth/QApplication.qth + * use default GT startup cvode (#include "hbgtreg.h") + + * harbour/include/hbinit.h + + harbour/include/hbiniseg.h + * replaced HB_MSC_STARTUP code with more universal HB_DATASEG_STARTUP + * moved HB_DATASEG_STARTUP code to separate header file to reduce + modifications in other files when this code has to be changed or + extended + + added support for startup code in OpenWatcom C builds. Now we can + create OpenWatcom Harbour binaries without forcing C++ mode. + I've tested Linux and Win32 builds and they works correctly. + Probably similar solution can be used also for other C compilers + which do not have native interface to define starup code. + + * harbour/src/compiler/genc.c + * harbour/utils/hbmk2/hbmk2.prg + * harbour/include/hbcdpreg.h + * harbour/include/hbgtreg.h + * harbour/src/rtl/hbregex.c + * harbour/src/rdd/dbf1.c + * harbour/src/rdd/dbfcdx/dbfcdx1.c + * harbour/src/rdd/dbffpt/dbffpt1.c + * harbour/src/rdd/dbfnsx/dbfnsx1.c + * harbour/src/rdd/dbfntx/dbfntx1.c + * harbour/src/rdd/delim1.c + * harbour/src/rdd/sdf1.c + * harbour/src/pp/pplib3.c + * harbour/contrib/rddads/ads1.c + * harbour/contrib/rddads/adsx.c + * harbour/contrib/rddsql/sddfb/fbirddd.c + * harbour/contrib/rddsql/sddmy/mysqldd.c + * harbour/contrib/rddsql/sddodbc/odbcdd.c + * harbour/contrib/rddsql/sddpg/pgsqldd.c + * harbour/contrib/rddsql/sqlbase.c + * harbour/contrib/rddsql/sqlmix.c + * harbour/contrib/hbbmcdx/bmdbfcdx.c + * harbour/contrib/hbmemio/memio.c + * harbour/contrib/hbnetio/netiocli.c + * harbour/contrib/hbbtree/hb_btree.c + * harbour/contrib/hbwin/olecore.c + * harbour/contrib/hbwin/win_com.c + * modified to use HB_DATASEG_STARTUP instead of HB_MSC_STARTUP + Now HB_MSC_STARTUP is local macro used only in hbinit.h. + Please make MSVC build tests. + + * harbour/contrib/hbmemio/memio.c + ! declare s_fileFuncs structure as static + * removed unnecessary code to directly register HB_MEMIO symbol. + Mindaugas if you need it for some reasons then I can reactivate it + but I would like to know why it's necessary for you. + + * harbour/src/vm/task.c + ! added missing {} + + * harbour/src/vm/fm.c + * locally disabled "unreachable code" warnings for dlmalloc.c + compilation by OpenWatcom in pure C mode + + * harbour/src/rtl/hbzlibgz.c + * minor code cleanup + + * harbour/src/rtl/filesys.c + * pacified OS/2 warnings + + * harbour/contrib/hbcairo/core.c + ! fixed casting for C++ builds + + * harbour/contrib/hbwin/wapi_winbase.c + ! fixed casting + + * harbour/src/Makefile + * changed the order of compiled libraries to improve little bit + the speed in concurrent (-j) builds + 2009-12-09 12:50 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * contrib/hbwin/legacyco.c * contrib/hbwin/wapi_winuser.c diff --git a/harbour/contrib/gtwvg/wvggui.c b/harbour/contrib/gtwvg/wvggui.c index 1de293185b..1111178de3 100644 --- a/harbour/contrib/gtwvg/wvggui.c +++ b/harbour/contrib/gtwvg/wvggui.c @@ -2254,24 +2254,6 @@ static BOOL hb_gt_FuncInit( PHB_GT_FUNCS pFuncTable ) /* ********************************************************************** */ -static const HB_GT_INIT gtInit = { HB_GT_DRVNAME( HB_GT_NAME ), - hb_gt_FuncInit, - HB_GTSUPER, - HB_GTID_PTR }; +#include "hbgtreg.h" -HB_GT_ANNOUNCE( HB_GT_NAME ) - -HB_CALL_ON_STARTUP_BEGIN( _hb_startup_gt_Init_ ) - hb_gtRegister( >Init ); -HB_CALL_ON_STARTUP_END( _hb_startup_gt_Init_ ) - -#if defined( HB_PRAGMA_STARTUP ) - #pragma startup _hb_startup_gt_Init_ -#elif defined( HB_MSC_STARTUP ) - #if defined( HB_OS_WIN_64 ) - #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif - #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto__hb_startup_gt_Init_ = _hb_startup_gt_Init_; - #pragma data_seg() -#endif +/* ********************************************************************** */ diff --git a/harbour/contrib/hbbmcdx/bmdbfcdx.c b/harbour/contrib/hbbmcdx/bmdbfcdx.c index e306ecad7e..f4b2db7c14 100644 --- a/harbour/contrib/hbbmcdx/bmdbfcdx.c +++ b/harbour/contrib/hbbmcdx/bmdbfcdx.c @@ -10505,12 +10505,8 @@ HB_CALL_ON_STARTUP_END( _hb_bmdbfcdx_rdd_init_ ) #if defined( HB_PRAGMA_STARTUP ) #pragma startup bmdbfcdx1__InitSymbols #pragma startup _hb_bmdbfcdx_rdd_init_ -#elif defined( HB_MSC_STARTUP ) - #if defined( HB_OS_WIN_64 ) - #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif - #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_bmdbfcdx1__InitSymbols = bmdbfcdx1__InitSymbols; - static HB_$INITSYM hb_vm_auto_bmdbfcdx_rdd_init = _hb_bmdbfcdx_rdd_init_; - #pragma data_seg() +#elif defined( HB_DATASEG_STARTUP ) + #define HB_DATASEG_BODY HB_DATASEG_FUNC( bmdbfcdx1__InitSymbols ) \ + HB_DATASEG_FUNC( _hb_bmdbfcdx_rdd_init_ ) + #include "hbiniseg.h" #endif diff --git a/harbour/contrib/hbbtree/hb_btree.c b/harbour/contrib/hbbtree/hb_btree.c index d288ae80f4..2837f32c49 100644 --- a/harbour/contrib/hbbtree/hb_btree.c +++ b/harbour/contrib/hbbtree/hb_btree.c @@ -2007,13 +2007,9 @@ HB_CALL_ON_STARTUP_END( _hb_BTree_Initialize_ ) #if defined( HB_PRAGMA_STARTUP ) #pragma startup _hb_BTree_Initialize_ -#elif defined( HB_MSC_STARTUP ) - #if defined( HB_OS_WIN_64 ) - #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif - #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_hb_BTree_Initialize_ = _hb_BTree_Initialize_; - #pragma data_seg() +#elif defined( HB_DATASEG_STARTUP ) + #define HB_DATASEG_BODY HB_DATASEG_FUNC( _hb_BTree_Initialize_ ) + #include "hbiniseg.h" #endif HB_EXTERN_END diff --git a/harbour/contrib/hbcairo/core.c b/harbour/contrib/hbcairo/core.c index db165852bb..50ef2f11c2 100644 --- a/harbour/contrib/hbcairo/core.c +++ b/harbour/contrib/hbcairo/core.c @@ -359,7 +359,7 @@ HB_FUNC( CAIRO_PATH_ITERATOR_NEXT ) cairo_path_t * pPath; #ifdef HB_USE_ITEM - pPath = hb_itemGetPtr( pIterator->pPath ); + pPath = ( cairo_path_t * ) hb_itemGetPtr( pIterator->pPath ); #else pPath = pIterator->pPath; #endif @@ -391,7 +391,7 @@ HB_FUNC( CAIRO_PATH_ITERATOR_GET_POINTS ) cairo_path_data_t * pData; #ifdef HB_USE_ITEM - pPath = hb_itemGetPtr( pIterator->pPath ); + pPath = ( cairo_path_t * ) hb_itemGetPtr( pIterator->pPath ); #else pPath = pIterator->pPath; #endif @@ -430,7 +430,7 @@ HB_FUNC( CAIRO_PATH_ITERATOR_SET_POINTS ) ULONG ulLen; #ifdef HB_USE_ITEM - pPath = hb_itemGetPtr( pIterator->pPath ); + pPath = ( cairo_path_t * ) hb_itemGetPtr( pIterator->pPath ); #else pPath = pIterator->pPath; #endif diff --git a/harbour/contrib/hbmemio/memio.c b/harbour/contrib/hbmemio/memio.c index 61ffb446fb..7599e30bca 100644 --- a/harbour/contrib/hbmemio/memio.c +++ b/harbour/contrib/hbmemio/memio.c @@ -820,7 +820,7 @@ static HB_FHANDLE s_fileHandle( PHB_FILE pFile ) } -const HB_FILE_FUNCS s_fileFuncs = +static const HB_FILE_FUNCS s_fileFuncs = { s_fileAccept, s_fileExists, @@ -850,24 +850,15 @@ static PHB_FILE s_fileNew( HB_FHANDLE hFile ) HB_FUNC( HB_MEMIO ) {;} -HB_INIT_SYMBOLS_BEGIN( iodmem__InitSymbols ) -{ "HB_MEMIO", {HB_FS_PUBLIC|HB_FS_LOCAL}, {HB_FUNCNAME( HB_MEMIO )}, NULL } -HB_INIT_SYMBOLS_END( iodmem__InitSymbols ) -HB_CALL_ON_STARTUP_BEGIN( _hb_file_io_init_ ) +HB_CALL_ON_STARTUP_BEGIN( _hb_file_memio_init_ ) memfsInit(); hb_fileRegister( &s_fileFuncs ); -HB_CALL_ON_STARTUP_END( _hb_file_io_init_ ) +HB_CALL_ON_STARTUP_END( _hb_file_memio_init_ ) #if defined( HB_PRAGMA_STARTUP ) - #pragma startup iodmem__InitSymbols - #pragma startup _hb_file_io_init_ -#elif defined( HB_MSC_STARTUP ) - #if defined( HB_OS_WIN_64 ) - #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif - #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_iodmem__InitSymbols = iodmem__InitSymbols; - static HB_$INITSYM hb_vm_auto_hb_file_io_init_ = _hb_file_io_init_; - #pragma data_seg() + #pragma startup _hb_file_memio_init_ +#elif defined( HB_DATASEG_STARTUP ) + #define HB_DATASEG_BODY HB_DATASEG_FUNC( _hb_file_memio_init_ ) + #include "hbiniseg.h" #endif diff --git a/harbour/contrib/hbnetio/netiocli.c b/harbour/contrib/hbnetio/netiocli.c index 57437a9e23..ef6928f5b5 100644 --- a/harbour/contrib/hbnetio/netiocli.c +++ b/harbour/contrib/hbnetio/netiocli.c @@ -832,19 +832,15 @@ static const HB_FILE_FUNCS * s_fileMethods( void ) */ #if defined( HB_NETIO_STARTUP_INIT ) -HB_CALL_ON_STARTUP_BEGIN( _hb_file_io_init_ ) +HB_CALL_ON_STARTUP_BEGIN( _hb_file_netio_init_ ) s_netio_init(); -HB_CALL_ON_STARTUP_END( _hb_file_io_init_ ) +HB_CALL_ON_STARTUP_END( _hb_file_netio_init_ ) #if defined( HB_PRAGMA_STARTUP ) - #pragma startup _hb_file_io_init_ -#elif defined( HB_MSC_STARTUP ) - #if defined( HB_OS_WIN_64 ) - #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif - #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_hb_file_io_init_ = _hb_file_io_init_; - #pragma data_seg() + #pragma startup _hb_file_netio_init_ +#elif defined( HB_DATASEG_STARTUP ) + #define HB_DATASEG_BODY HB_DATASEG_FUNC( _hb_file_netio_init_ ) + #include "hbiniseg.h" #endif #endif /* HB_NETIO_STARTUP_INIT */ diff --git a/harbour/contrib/hbqt/qtgui/QApplication.cpp b/harbour/contrib/hbqt/qtgui/QApplication.cpp index bc4336ba16..b60595f74d 100644 --- a/harbour/contrib/hbqt/qtgui/QApplication.cpp +++ b/harbour/contrib/hbqt/qtgui/QApplication.cpp @@ -142,13 +142,9 @@ HB_CALL_ON_STARTUP_END( _hb_hbqt_init_ ) #if defined( HB_PRAGMA_STARTUP ) #pragma startup _hb_hbqt_init_ -#elif defined( HB_MSC_STARTUP ) - #if defined( HB_OS_WIN_64 ) - #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif - #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_auto_hbqt_init_ = _hb_hbqt_init_; - #pragma data_seg() +#elif defined( HB_DATASEG_STARTUP ) + #define HB_DATASEG_BODY HB_DATASEG_FUNC( _hb_hbqt_init_ ) + #include "hbiniseg.h" #endif HB_FUNC( QT_QAPPLICATION_EXECUTE ) diff --git a/harbour/contrib/hbqt/qth/QApplication.qth b/harbour/contrib/hbqt/qth/QApplication.qth index 5c0544a398..a572985e18 100644 --- a/harbour/contrib/hbqt/qth/QApplication.qth +++ b/harbour/contrib/hbqt/qth/QApplication.qth @@ -133,13 +133,9 @@ HB_CALL_ON_STARTUP_END( _hb_hbqt_init_ ) #if defined( HB_PRAGMA_STARTUP ) #pragma startup _hb_hbqt_init_ -#elif defined( HB_MSC_STARTUP ) - #if defined( HB_OS_WIN_64 ) - #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif - #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_auto_hbqt_init_ = _hb_hbqt_init_; - #pragma data_seg() +#elif defined( HB_DATASEG_STARTUP ) + #define HB_DATASEG_BODY HB_DATASEG_FUNC( _hb_hbqt_init_ ) + #include "hbiniseg.h" #endif HB_FUNC( QT_QAPPLICATION_EXECUTE ) diff --git a/harbour/contrib/hbwin/olecore.c b/harbour/contrib/hbwin/olecore.c index 7f39606a09..3671be0483 100644 --- a/harbour/contrib/hbwin/olecore.c +++ b/harbour/contrib/hbwin/olecore.c @@ -1441,11 +1441,7 @@ HB_CALL_ON_STARTUP_END( _hb_olecore_init_ ) #if defined( HB_PRAGMA_STARTUP ) #pragma startup _hb_olecore_init_ -#elif defined( HB_MSC_STARTUP ) - #if defined( HB_OS_WIN_64 ) - #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif - #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_olecore_init = _hb_olecore_init_; - #pragma data_seg() +#elif defined( HB_DATASEG_STARTUP ) + #define HB_DATASEG_BODY HB_DATASEG_FUNC( _hb_olecore_init_ ) + #include "hbiniseg.h" #endif diff --git a/harbour/contrib/hbwin/wapi_winbase.c b/harbour/contrib/hbwin/wapi_winbase.c index c9271c6040..21b134c47a 100644 --- a/harbour/contrib/hbwin/wapi_winbase.c +++ b/harbour/contrib/hbwin/wapi_winbase.c @@ -160,7 +160,7 @@ HB_FUNC( WAPI_FORMATMESSAGE ) DWORD dwRetVal; hb_retnl( dwRetVal = FormatMessage( ( DWORD ) hb_parnldef( 1, FORMAT_MESSAGE_FROM_SYSTEM ) /* dwFlags */, - ( LPCVOID ) ( HB_ISCHAR( 2 ) ? HB_PARSTR( 2, &hSource, NULL ) : hb_parptr( 2 ) ), + HB_ISCHAR( 2 ) ? ( LPCVOID ) HB_PARSTR( 2, &hSource, NULL ) : hb_parptr( 2 ), HB_ISNUM( 3 ) ? ( DWORD ) hb_parnl( 3 ) : GetLastError() /* dwMessageId */, ( DWORD ) hb_parnldef( 4, MAKELANGID( LANG_NEUTRAL, SUBLANG_DEFAULT ) ) /* dwLanguageId */, lpBuffer, diff --git a/harbour/contrib/hbwin/win_com.c b/harbour/contrib/hbwin/win_com.c index 5b500b75e5..094b0813c0 100644 --- a/harbour/contrib/hbwin/win_com.c +++ b/harbour/contrib/hbwin/win_com.c @@ -847,11 +847,7 @@ HB_CALL_ON_STARTUP_END( _hb_wincom_init_ ) #if defined( HB_PRAGMA_STARTUP ) #pragma startup _hb_wincom_init_ -#elif defined( HB_MSC_STARTUP ) - #if defined( HB_OS_WIN_64 ) - #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif - #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_wincom_init = _hb_wincom_init_; - #pragma data_seg() +#elif defined( HB_DATASEG_STARTUP ) + #define HB_DATASEG_BODY HB_DATASEG_FUNC( _hb_wincom_init_ ) + #include "hbiniseg.h" #endif diff --git a/harbour/contrib/rddads/ads1.c b/harbour/contrib/rddads/ads1.c index 690b1b2254..f5d625718f 100644 --- a/harbour/contrib/rddads/ads1.c +++ b/harbour/contrib/rddads/ads1.c @@ -5260,14 +5260,10 @@ HB_CALL_ON_STARTUP_END( _hb_ads_rdd_init_ ) #if defined( HB_PRAGMA_STARTUP ) #pragma startup ads1__InitSymbols #pragma startup _hb_ads_rdd_init_ -#elif defined( HB_MSC_STARTUP ) - #if defined( HB_OS_WIN_64 ) - #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif - #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_ads1__InitSymbols = ads1__InitSymbols; - static HB_$INITSYM hb_vm_auto_ads_rdd_init = _hb_ads_rdd_init_; - #pragma data_seg() +#elif defined( HB_DATASEG_STARTUP ) + #define HB_DATASEG_BODY HB_DATASEG_FUNC( ads1__InitSymbols ) \ + HB_DATASEG_FUNC( _hb_ads_rdd_init_ ) + #include "hbiniseg.h" #endif ADSAREAP hb_adsGetWorkAreaPointer( void ) diff --git a/harbour/contrib/rddads/adsx.c b/harbour/contrib/rddads/adsx.c index 37757ad495..e7388d3369 100644 --- a/harbour/contrib/rddads/adsx.c +++ b/harbour/contrib/rddads/adsx.c @@ -1512,12 +1512,8 @@ HB_CALL_ON_STARTUP_END( _hb_adsx_rdd_init_ ) #if defined( HB_PRAGMA_STARTUP ) #pragma startup adsx1__InitSymbols #pragma startup _hb_adsx_rdd_init_ -#elif defined( HB_MSC_STARTUP ) - #if defined( HB_OS_WIN_64 ) - #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif - #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_adsx1__InitSymbols = adsx1__InitSymbols; - static HB_$INITSYM hb_vm_auto_adsx_rdd_init = _hb_adsx_rdd_init_; - #pragma data_seg() +#elif defined( HB_DATASEG_STARTUP ) + #define HB_DATASEG_BODY HB_DATASEG_FUNC( adsx1__InitSymbols ) \ + HB_DATASEG_FUNC( _hb_adsx_rdd_init_ ) + #include "hbiniseg.h" #endif diff --git a/harbour/contrib/rddsql/sddfb/fbirddd.c b/harbour/contrib/rddsql/sddfb/fbirddd.c index cf35244f9e..b74e9a6a45 100644 --- a/harbour/contrib/rddsql/sddfb/fbirddd.c +++ b/harbour/contrib/rddsql/sddfb/fbirddd.c @@ -117,14 +117,10 @@ HB_CALL_ON_STARTUP_END( _hb_firebirddd_init_ ) #if defined( HB_PRAGMA_STARTUP ) #pragma startup firebirddd__InitSymbols #pragma startup _hb_firebirddd_init_ -#elif defined( HB_MSC_STARTUP ) - #if defined( HB_OS_WIN_64 ) - #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif - #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_firebirddd__InitSymbols = firebirddd__InitSymbols; - static HB_$INITSYM hb_vm_auto_firebirddd_init = _hb_firebirddd_init_; - #pragma data_seg() +#elif defined( HB_DATASEG_STARTUP ) + #define HB_DATASEG_BODY HB_DATASEG_FUNC( firebirddd__InitSymbols ) \ + HB_DATASEG_FUNC( _hb_firebirddd_init_ ) + #include "hbiniseg.h" #endif diff --git a/harbour/contrib/rddsql/sddmy/mysqldd.c b/harbour/contrib/rddsql/sddmy/mysqldd.c index 06869cbf1a..b486416695 100644 --- a/harbour/contrib/rddsql/sddmy/mysqldd.c +++ b/harbour/contrib/rddsql/sddmy/mysqldd.c @@ -123,14 +123,10 @@ HB_CALL_ON_STARTUP_END( _hb_mysqldd_init_ ) #if defined( HB_PRAGMA_STARTUP ) #pragma startup mysqldd__InitSymbols #pragma startup _hb_mysqldd_init_ -#elif defined( HB_MSC_STARTUP ) - #if defined( HB_OS_WIN_64 ) - #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif - #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_mysqldd__InitSymbols = mysqldd__InitSymbols; - static HB_$INITSYM hb_vm_auto_mysqldd_init = _hb_mysqldd_init_; - #pragma data_seg() +#elif defined( HB_DATASEG_STARTUP ) + #define HB_DATASEG_BODY HB_DATASEG_FUNC( mysqldd__InitSymbols ) \ + HB_DATASEG_FUNC( _hb_mysqldd_init_ ) + #include "hbiniseg.h" #endif diff --git a/harbour/contrib/rddsql/sddodbc/odbcdd.c b/harbour/contrib/rddsql/sddodbc/odbcdd.c index 47ce3bb029..e6dcc452a7 100644 --- a/harbour/contrib/rddsql/sddodbc/odbcdd.c +++ b/harbour/contrib/rddsql/sddodbc/odbcdd.c @@ -129,14 +129,10 @@ HB_CALL_ON_STARTUP_END( _hb_odbcdd_init_ ) #if defined( HB_PRAGMA_STARTUP ) #pragma startup odbcdd__InitSymbols #pragma startup _hb_odbcdd_init_ -#elif defined( HB_MSC_STARTUP ) - #if defined( HB_OS_WIN_64 ) - #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif - #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_odbcdd__InitSymbols = odbcdd__InitSymbols; - static HB_$INITSYM hb_vm_auto_odbcdd_init = _hb_odbcdd_init_; - #pragma data_seg() +#elif defined( HB_DATASEG_STARTUP ) + #define HB_DATASEG_BODY HB_DATASEG_FUNC( odbcdd__InitSymbols ) \ + HB_DATASEG_FUNC( _hb_odbcdd_init_ ) + #include "hbiniseg.h" #endif diff --git a/harbour/contrib/rddsql/sddpg/pgsqldd.c b/harbour/contrib/rddsql/sddpg/pgsqldd.c index 77f9441ceb..cce93dae53 100644 --- a/harbour/contrib/rddsql/sddpg/pgsqldd.c +++ b/harbour/contrib/rddsql/sddpg/pgsqldd.c @@ -142,14 +142,10 @@ HB_CALL_ON_STARTUP_END( _hb_sddpostgre_init_ ) #if defined( HB_PRAGMA_STARTUP ) #pragma startup sddpostgre__InitSymbols #pragma startup _hb_sddpostgre_init_ -#elif defined( HB_MSC_STARTUP ) - #if defined( HB_OS_WIN_64 ) - #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif - #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_sddpostgre__InitSymbols = sddpostgre__InitSymbols; - static HB_$INITSYM hb_vm_auto_sddpostgre_init = _hb_sddpostgre_init_; - #pragma data_seg() +#elif defined( HB_DATASEG_STARTUP ) + #define HB_DATASEG_BODY HB_DATASEG_FUNC( sddpostgre__InitSymbols ) \ + HB_DATASEG_FUNC( _hb_sddpostgre_init_ ) + #include "hbiniseg.h" #endif diff --git a/harbour/contrib/rddsql/sqlbase.c b/harbour/contrib/rddsql/sqlbase.c index c4f374e617..b62eee653b 100644 --- a/harbour/contrib/rddsql/sqlbase.c +++ b/harbour/contrib/rddsql/sqlbase.c @@ -1254,10 +1254,10 @@ HB_FUNC( SQLBASE_GETFUNCTABLE ) } -HB_INIT_SYMBOLS_BEGIN( sqlbase1__InitSymbols ) +HB_INIT_SYMBOLS_BEGIN( sqlbase__InitSymbols ) { "SQLBASE", {HB_FS_PUBLIC}, {HB_FUNCNAME( SQLBASE )}, NULL }, { "SQLBASE_GETFUNCTABLE", {HB_FS_PUBLIC}, {HB_FUNCNAME( SQLBASE_GETFUNCTABLE )}, NULL } -HB_INIT_SYMBOLS_END( sqlbase1__InitSymbols ) +HB_INIT_SYMBOLS_END( sqlbase__InitSymbols ) HB_CALL_ON_STARTUP_BEGIN( _hb_sqlbase_init_ ) hb_vmAtInit( hb_sqlbaseInit, NULL ); @@ -1266,12 +1266,8 @@ HB_CALL_ON_STARTUP_END( _hb_sqlbase_init_ ) #if defined( HB_PRAGMA_STARTUP ) #pragma startup sqlbase1__InitSymbols #pragma startup _hb_sqlbase_init_ -#elif defined( HB_MSC_STARTUP ) - #if defined( HB_OS_WIN_64 ) - #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif - #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_sqlbase1__InitSymbols = sqlbase1__InitSymbols; - static HB_$INITSYM hb_vm_auto_sqlbase_init = _hb_sqlbase_init_; - #pragma data_seg() +#elif defined( HB_DATASEG_STARTUP ) + #define HB_DATASEG_BODY HB_DATASEG_FUNC( sqlbase__InitSymbols ) \ + HB_DATASEG_FUNC( _hb_sqlbase_init_ ) + #include "hbiniseg.h" #endif diff --git a/harbour/contrib/rddsql/sqlmix.c b/harbour/contrib/rddsql/sqlmix.c index aa431a572e..1f9ffc4628 100644 --- a/harbour/contrib/rddsql/sqlmix.c +++ b/harbour/contrib/rddsql/sqlmix.c @@ -2230,12 +2230,8 @@ HB_CALL_ON_STARTUP_END( _hb_sqlmix_rdd_init_ ) #if defined( HB_PRAGMA_STARTUP ) #pragma startup sqlmix__InitSymbols #pragma startup _hb_sqlmix_rdd_init_ -#elif defined( HB_MSC_STARTUP ) - #if defined( HB_OS_WIN_64 ) - #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif - #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_sqlmix__InitSymbols = sqlmix__InitSymbols; - static HB_$INITSYM hb_vm_auto_sqlmix_rdd_init = _hb_sqlmix_rdd_init_; - #pragma data_seg() +#elif defined( HB_DATASEG_STARTUP ) + #define HB_DATASEG_BODY HB_DATASEG_FUNC( sqlmix__InitSymbols ) \ + HB_DATASEG_FUNC( _hb_sqlmix_rdd_init_ ) + #include "hbiniseg.h" #endif diff --git a/harbour/include/hbapilng.h b/harbour/include/hbapilng.h index 9e7c65ff5d..4450c5adde 100644 --- a/harbour/include/hbapilng.h +++ b/harbour/include/hbapilng.h @@ -70,7 +70,8 @@ HB_EXTERN_BEGIN } /* Macro to publish a specific language module, for both C and Harbour level */ -#define HB_LANG_ANNOUNCE( id ) HB_FUNC( HB_LANG_##id ) {} +#define HB_LANG_ANNOUNCE( id ) HB_LANG_ANNOUNCE_( id ) +#define HB_LANG_ANNOUNCE_( id ) HB_FUNC( HB_LANG_##id ) {} typedef struct _HB_LANG { diff --git a/harbour/include/hbcdpreg.h b/harbour/include/hbcdpreg.h index 9b26498d86..825f6197ec 100644 --- a/harbour/include/hbcdpreg.h +++ b/harbour/include/hbcdpreg.h @@ -54,7 +54,7 @@ HB_CODEPAGE_ANNOUNCE( HB_CP_ID ) -#if defined( HB_PRAGMA_STARTUP ) || defined( HB_MSC_STARTUP ) +#if defined( HB_PRAGMA_STARTUP ) HB_CALL_ON_STARTUP_BEGIN( _hb_codepage_Init_ ) #else HB_CALL_ON_STARTUP_BEGIN( HB_MACRONAME_JOIN( _hb_codepage_Init_, HB_CP_ID ) ) @@ -84,7 +84,7 @@ HB_CALL_ON_STARTUP_BEGIN( HB_MACRONAME_JOIN( _hb_codepage_Init_, HB_CP_ID ) ) HB_CP_UPPER, HB_CP_LOWER, HB_CP_ACSORT ); #endif /* HB_CP_RAW */ -#if defined( HB_PRAGMA_STARTUP ) || defined( HB_MSC_STARTUP ) +#if defined( HB_PRAGMA_STARTUP ) HB_CALL_ON_STARTUP_END( _hb_codepage_Init_ ) #else HB_CALL_ON_STARTUP_END( HB_MACRONAME_JOIN( _hb_codepage_Init_, HB_CP_ID ) ) @@ -92,11 +92,8 @@ HB_CALL_ON_STARTUP_END( HB_MACRONAME_JOIN( _hb_codepage_Init_, HB_CP_ID ) ) #if defined( HB_PRAGMA_STARTUP ) #pragma startup _hb_codepage_Init_ -#elif defined( HB_MSC_STARTUP ) - #if defined( HB_OS_WIN_64 ) - #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif - #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_hb_codepage_Init_ = _hb_codepage_Init_; - #pragma data_seg() +#elif defined( HB_DATASEG_STARTUP ) + #define HB_DATASEG_BODY \ + HB_DATASEG_FUNC( HB_MACRONAME_JOIN( _hb_codepage_Init_, HB_CP_ID ) ) + #include "hbiniseg.h" #endif diff --git a/harbour/include/hbgtreg.h b/harbour/include/hbgtreg.h index e044ecddcc..23583faefb 100644 --- a/harbour/include/hbgtreg.h +++ b/harbour/include/hbgtreg.h @@ -57,7 +57,7 @@ static const HB_GT_INIT gtInit = { HB_GT_DRVNAME( HB_GT_NAME ), HB_GT_ANNOUNCE( HB_GT_NAME ) -#if defined( HB_PRAGMA_STARTUP ) || defined( HB_MSC_STARTUP ) +#if defined( HB_PRAGMA_STARTUP ) HB_CALL_ON_STARTUP_BEGIN( _hb_startup_gt_Init_ ) hb_gtRegister( >Init ); HB_CALL_ON_STARTUP_END( _hb_startup_gt_Init_ ) @@ -69,11 +69,8 @@ HB_CALL_ON_STARTUP_END( HB_MACRONAME_JOIN( _hb_startup_gt_Init_, HB_GT_NAME ) ) #if defined( HB_PRAGMA_STARTUP ) #pragma startup _hb_startup_gt_Init_ -#elif defined( HB_MSC_STARTUP ) - #if defined( HB_OS_WIN_64 ) - #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif - #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto__hb_startup_gt_Init_ = _hb_startup_gt_Init_; - #pragma data_seg() +#elif defined( HB_DATASEG_STARTUP ) + #define HB_DATASEG_BODY \ + HB_DATASEG_FUNC( HB_MACRONAME_JOIN( _hb_startup_gt_Init_, HB_GT_NAME ) ) + #include "hbiniseg.h" #endif diff --git a/harbour/include/hbiniseg.h b/harbour/include/hbiniseg.h new file mode 100644 index 0000000000..e7211f7846 --- /dev/null +++ b/harbour/include/hbiniseg.h @@ -0,0 +1,75 @@ +/* + * $Id$ + */ + +/* + * Harbour Project source code: + * startup code using special data segments + * + * Copyright 2009 Przemyslaw Czerpak + * www - http://www.harbour-project.org + * + * This code uses MSC startup macros created by + * Paul Tucker + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this software; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 59 Temple Place, Suite 330, + * Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/). + * + * As a special exception, the Harbour Project gives permission for + * additional uses of the text contained in its release of Harbour. + * + * The exception is that, if you link the Harbour libraries with other + * files to produce an executable, this does not by itself cause the + * resulting executable to be covered by the GNU General Public License. + * Your use of that executable is in no way restricted on account of + * linking the Harbour library code into it. + * + * This exception does not however invalidate any other reasons why + * the executable file might be covered by the GNU General Public License. + * + * This exception applies only to the code released by the Harbour + * Project under the name Harbour. If you copy code from other + * Harbour Project or Free Software Foundation releases into a copy of + * Harbour, as the General Public License permits, the exception does + * not apply to the code that you add in this way. To avoid misleading + * anyone as to the status of such modified files, you must delete + * this exception notice from them. + * + * If you write modifications of your own for Harbour, it is your choice + * whether to permit this exception to apply to your modifications. + * If you do not wish that, delete this exception notice. + * + */ + +#if defined( HB_DATASEG_STARTUP ) + + #if defined( __WATCOMC__ ) + #pragma off (unreferenced) /* disable unused variable warnings */ + #elif defined( _MSC_VER ) && defined( HB_OS_WIN_64 ) + #pragma section( HB_STARTUP_SEGMENT, long, read ) + #endif + + #pragma data_seg( HB_STARTUP_SEGMENT ) + + HB_DATASEG_BODY + #undef HB_DATASEG_BODY + + #pragma data_seg() + + #if defined( __WATCOMC__ ) + #pragma on (unreferenced) /* reenable unused variable warnings */ + #endif + +#endif diff --git a/harbour/include/hbinit.h b/harbour/include/hbinit.h index 280a42e397..8c6b991118 100644 --- a/harbour/include/hbinit.h +++ b/harbour/include/hbinit.h @@ -114,7 +114,7 @@ extern HB_EXPORT PHB_SYMB hb_vmProcessSymbols( PHB_SYMB pSymbols, USHORT uiSymbo #elif defined( __GNUC__ ) || defined( __SUNPRO_C ) || defined( __SUNPRO_CC ) - #if defined( HB_PRAGMA_STARTUP ) || defined( HB_MSC_STARTUP ) + #if defined( HB_PRAGMA_STARTUP ) || defined( HB_MSC_STARTUP ) #error Wrong macros set for startup code - clean your make/env settings. #endif @@ -138,12 +138,12 @@ extern HB_EXPORT PHB_SYMB hb_vmProcessSymbols( PHB_SYMB pSymbols, USHORT uiSymbo #elif defined( HB_MSC_STARTUP ) - typedef int (* HB_$INITSYM)( void ); + #define HB_DATASEG_STARTUP #if _MSC_VER >= 1010 - #define HB_MSC_START_SEGMENT ".CRT$XIY" + #define HB_STARTUP_SEGMENT ".CRT$XIY" #else - #define HB_MSC_START_SEGMENT "XIY" + #define HB_STARTUP_SEGMENT "XIY" #endif #define HB_INIT_SYMBOLS_BEGIN( func ) \ @@ -166,9 +166,15 @@ extern HB_EXPORT PHB_SYMB hb_vmProcessSymbols( PHB_SYMB pSymbols, USHORT uiSymbo return 0; \ } - /* After each '_END' symbol, additional 'hooks' are required See the C - output of a generated prg for example - */ + typedef int (* HB_$INITSYM)( void ); + + #define HB_DATASEG_FUNC( func ) HB_DATASEG_FUNC_( func ) + #define HB_DATASEG_FUNC_( func ) \ + static HB_$INITSYM _s_init_func_##func = func; + + /* After each '*_END' symbol, additional 'hooks' are required + * See the C output of a generated prg for example + */ #elif defined( HB_STATIC_STARTUP ) || defined( __cplusplus ) @@ -226,6 +232,48 @@ extern HB_EXPORT PHB_SYMB hb_vmProcessSymbols( PHB_SYMB pSymbols, USHORT uiSymbo #define HB_CALL_ON_STARTUP_END( func ) \ } +#elif defined( __WATCOMC__ ) + + #define HB_INIT_SYMBOLS_BEGIN( func ) \ + static HB_SYMB symbols_table[] = { + + #define HB_INIT_SYMBOLS_EX_END( func, module, id, vpcode ) \ + }; \ + static PHB_SYMB symbols = symbols_table; \ + static void func( void ) \ + { \ + symbols = hb_vmProcessSymbols( symbols_table, (USHORT) ( sizeof( symbols_table ) / sizeof( HB_SYMB ) ), (module), (id), (vpcode) ); \ + } + + #define HB_CALL_ON_STARTUP_BEGIN( func ) \ + static void func( void ) \ + { + + #define HB_CALL_ON_STARTUP_END( func ) \ + } + + #define HB_DATASEG_STARTUP + #define HB_STARTUP_SEGMENT "XI" + + #define HB_WATCOM_STARTUP_ID 0x00 + #define HB_WATCOM_STARTUP_PRIORITY 0x40 /* default "program" priority */ + + #pragma pack( __push, 1 ) + struct _s_init_info_ + { + unsigned char id; + unsigned char priority; + void ( * func ) ( void ); + }; + #pragma pack( __pop ) + + + #define HB_DATASEG_FUNC( func ) HB_DATASEG_FUNC_( func ) + + #define HB_DATASEG_FUNC_( func ) \ + static struct _s_init_info_ _s_init_info_##func = \ + { HB_WATCOM_STARTUP_ID, HB_WATCOM_STARTUP_PRIORITY, func }; + #else #error Unknown initialization method. #endif diff --git a/harbour/include/hbmsgreg.h b/harbour/include/hbmsgreg.h new file mode 100644 index 0000000000..86dd0d8580 --- /dev/null +++ b/harbour/include/hbmsgreg.h @@ -0,0 +1,75 @@ +/* + * $Id$ + */ + +/* + * Harbour Project source code: + * code used to register new lang definition + * + * Copyright 2009 Przemyslaw Czerpak + * www - http://www.harbour-project.org + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this software; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 59 Temple Place, Suite 330, + * Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/). + * + * As a special exception, the Harbour Project gives permission for + * additional uses of the text contained in its release of Harbour. + * + * The exception is that, if you link the Harbour libraries with other + * files to produce an executable, this does not by itself cause the + * resulting executable to be covered by the GNU General Public License. + * Your use of that executable is in no way restricted on account of + * linking the Harbour library code into it. + * + * This exception does not however invalidate any other reasons why + * the executable file might be covered by the GNU General Public License. + * + * This exception applies only to the code released by the Harbour + * Project under the name Harbour. If you copy code from other + * Harbour Project or Free Software Foundation releases into a copy of + * Harbour, as the General Public License permits, the exception does + * not apply to the code that you add in this way. To avoid misleading + * anyone as to the status of such modified files, you must delete + * this exception notice from them. + * + * If you write modifications of your own for Harbour, it is your choice + * whether to permit this exception to apply to your modifications. + * If you do not wish that, delete this exception notice. + * + */ + +#if defined( HB_LANG_ID ) + +HB_LANG_ANNOUNCE( HB_LANG_ID ) + +#if defined( HB_PRAGMA_STARTUP ) +HB_CALL_ON_STARTUP_BEGIN( _hb_lang_Init_ ) + hb_langRegister( &s_lang ); +HB_CALL_ON_STARTUP_END( _hb_lang_Init_ ) +#else +HB_CALL_ON_STARTUP_BEGIN( HB_MACRONAME_JOIN( _hb_lang_Init_, HB_LANG_ID ) ) + hb_langRegister( &s_lang ); +HB_CALL_ON_STARTUP_END( HB_MACRONAME_JOIN( _hb_lang_Init_, HB_LANG_ID ) ) +#endif + +#if defined( HB_PRAGMA_STARTUP ) + #pragma startup hb_lang_Init_ +#elif defined( HB_DATASEG_STARTUP ) + #define HB_DATASEG_BODY \ + HB_DATASEG_FUNC( HB_MACRONAME_JOIN( _hb_lang_Init_, HB_LANG_ID ) ) + #include "hbiniseg.h" +#endif + +#endif /* HB_LANG_ID */ diff --git a/harbour/src/Makefile b/harbour/src/Makefile index d49bf17375..1e35671af1 100644 --- a/harbour/src/Makefile +++ b/harbour/src/Makefile @@ -88,8 +88,8 @@ else pp{common,nortl} \ compiler{pp} \ $(HB_COMP_DIR) \ - rtl$(HB_COMP_REF) \ vm$(HB_COMP_REF) \ + rtl$(HB_COMP_REF) \ macro \ codepage \ lang \ diff --git a/harbour/src/compiler/genc.c b/harbour/src/compiler/genc.c index 9306916161..778e08f91b 100644 --- a/harbour/src/compiler/genc.c +++ b/harbour/src/compiler/genc.c @@ -442,16 +442,11 @@ static void hb_writeEndInit( HB_COMP_DECL, FILE* yyc, const char * szModulname, fprintf( yyc, "#if defined( HB_PRAGMA_STARTUP )\n" " #pragma startup hb_vm_SymbolInit_%s%s\n" - "#elif defined( HB_MSC_STARTUP )\n" - " #if defined( HB_OS_WIN_64 )\n" - " #pragma section( HB_MSC_START_SEGMENT, long, read )\n" - " #endif\n" - " #pragma data_seg( HB_MSC_START_SEGMENT )\n" - " static HB_$INITSYM hb_vm_auto_SymbolInit_%s%s = hb_vm_SymbolInit_%s%s;\n" - " #pragma data_seg()\n" + "#elif defined( HB_DATASEG_STARTUP )\n" + " #define HB_DATASEG_BODY HB_DATASEG_FUNC( hb_vm_SymbolInit_%s%s )\n" + " #include \"hbiniseg.h\"\n" "#endif\n\n", HB_COMP_PARAM->szPrefix, szModulname, - HB_COMP_PARAM->szPrefix, szModulname, HB_COMP_PARAM->szPrefix, szModulname ); } diff --git a/harbour/src/lang/msg_tpl.c b/harbour/src/lang/msg_tpl.c index 0956fa5566..3afdf82d47 100644 --- a/harbour/src/lang/msg_tpl.c +++ b/harbour/src/lang/msg_tpl.c @@ -200,19 +200,5 @@ static HB_LANG s_lang = } }; -HB_LANG_ANNOUNCE( TPL ) - -HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_TPL ) - hb_langRegister( &s_lang ); -HB_CALL_ON_STARTUP_END( hb_lang_Init_TPL ) - -#if defined( HB_PRAGMA_STARTUP ) - #pragma startup hb_lang_Init_TPL -#elif defined( HB_MSC_STARTUP ) - #if defined( HB_OS_WIN_64 ) - #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif - #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_hb_lang_Init_TPL = hb_lang_Init_TPL; - #pragma data_seg() -#endif +#define HB_LANG_ID EN +#include "hbmsgreg.h" diff --git a/harbour/src/lang/msgbe866.c b/harbour/src/lang/msgbe866.c index 23a76a8add..bbdfd738dd 100644 --- a/harbour/src/lang/msgbe866.c +++ b/harbour/src/lang/msgbe866.c @@ -200,19 +200,5 @@ static HB_LANG s_lang = } }; -HB_LANG_ANNOUNCE( BE866 ) - -HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_BE866 ) - hb_langRegister( &s_lang ); -HB_CALL_ON_STARTUP_END( hb_lang_Init_BE866 ) - -#if defined( HB_PRAGMA_STARTUP ) - #pragma startup hb_lang_Init_BE866 -#elif defined( HB_MSC_STARTUP ) - #if defined( HB_OS_WIN_64 ) - #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif - #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_hb_lang_Init_BE866 = hb_lang_Init_BE866; - #pragma data_seg() -#endif +#define HB_LANG_ID BE866 +#include "hbmsgreg.h" diff --git a/harbour/src/lang/msgbewin.c b/harbour/src/lang/msgbewin.c index b9dacfdee8..b017da2e93 100644 --- a/harbour/src/lang/msgbewin.c +++ b/harbour/src/lang/msgbewin.c @@ -200,19 +200,5 @@ static HB_LANG s_lang = } }; -HB_LANG_ANNOUNCE( BEWIN ) - -HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_BEWIN ) - hb_langRegister( &s_lang ); -HB_CALL_ON_STARTUP_END( hb_lang_Init_BEWIN ) - -#if defined( HB_PRAGMA_STARTUP ) - #pragma startup hb_lang_Init_BEWIN -#elif defined( HB_MSC_STARTUP ) - #if defined( HB_OS_WIN_64 ) - #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif - #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_hb_lang_Init_BEWIN = hb_lang_Init_BEWIN; - #pragma data_seg() -#endif +#define HB_LANG_ID BEWIN +#include "hbmsgreg.h" diff --git a/harbour/src/lang/msgbg866.c b/harbour/src/lang/msgbg866.c index 15219e0db4..4aeb3b5b38 100644 --- a/harbour/src/lang/msgbg866.c +++ b/harbour/src/lang/msgbg866.c @@ -200,19 +200,5 @@ static HB_LANG s_lang = } }; -HB_LANG_ANNOUNCE( BG866 ) - -HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_BG866 ) - hb_langRegister( &s_lang ); -HB_CALL_ON_STARTUP_END( hb_lang_Init_BG866 ) - -#if defined( HB_PRAGMA_STARTUP ) - #pragma startup hb_lang_Init_BG866 -#elif defined( HB_MSC_STARTUP ) - #if defined( HB_OS_WIN_64 ) - #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif - #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_hb_lang_Init_BG866 = hb_lang_Init_BG866; - #pragma data_seg() -#endif +#define HB_LANG_ID BG866 +#include "hbmsgreg.h" diff --git a/harbour/src/lang/msgbgiso.c b/harbour/src/lang/msgbgiso.c index 2c6066be8e..c6f1656e3f 100644 --- a/harbour/src/lang/msgbgiso.c +++ b/harbour/src/lang/msgbgiso.c @@ -200,19 +200,5 @@ static HB_LANG s_lang = } }; -HB_LANG_ANNOUNCE( BGISO ) - -HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_BGISO ) - hb_langRegister( &s_lang ); -HB_CALL_ON_STARTUP_END( hb_lang_Init_BGISO ) - -#if defined( HB_PRAGMA_STARTUP ) - #pragma startup hb_lang_Init_BGISO -#elif defined( HB_MSC_STARTUP ) - #if defined( HB_OS_WIN_64 ) - #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif - #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_hb_lang_Init_BGISO = hb_lang_Init_BGISO; - #pragma data_seg() -#endif +#define HB_LANG_ID BGISO +#include "hbmsgreg.h" diff --git a/harbour/src/lang/msgbgmik.c b/harbour/src/lang/msgbgmik.c index 1c7198f7c0..373291fb7b 100644 --- a/harbour/src/lang/msgbgmik.c +++ b/harbour/src/lang/msgbgmik.c @@ -200,19 +200,5 @@ static HB_LANG s_lang = } }; -HB_LANG_ANNOUNCE( BGMIK ) - -HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_BGMIK ) - hb_langRegister( &s_lang ); -HB_CALL_ON_STARTUP_END( hb_lang_Init_BGMIK ) - -#if defined( HB_PRAGMA_STARTUP ) - #pragma startup hb_lang_Init_BGMIK -#elif defined( HB_MSC_STARTUP ) - #if defined( HB_OS_WIN_64 ) - #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif - #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_hb_lang_Init_BGMIK = hb_lang_Init_BGMIK; - #pragma data_seg() -#endif +#define HB_LANG_ID BGMIK +#include "hbmsgreg.h" diff --git a/harbour/src/lang/msgbgwin.c b/harbour/src/lang/msgbgwin.c index 331002e361..be118ae609 100644 --- a/harbour/src/lang/msgbgwin.c +++ b/harbour/src/lang/msgbgwin.c @@ -200,19 +200,5 @@ static HB_LANG s_lang = } }; -HB_LANG_ANNOUNCE( BGWIN ) - -HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_BGWIN ) - hb_langRegister( &s_lang ); -HB_CALL_ON_STARTUP_END( hb_lang_Init_BGWIN ) - -#if defined( HB_PRAGMA_STARTUP ) - #pragma startup hb_lang_Init_BGWIN -#elif defined( HB_MSC_STARTUP ) - #if defined( HB_OS_WIN_64 ) - #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif - #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_hb_lang_Init_BGWIN = hb_lang_Init_BGWIN; - #pragma data_seg() -#endif +#define HB_LANG_ID BGWIN +#include "hbmsgreg.h" diff --git a/harbour/src/lang/msgca.c b/harbour/src/lang/msgca.c index b91abd1429..7607195e96 100644 --- a/harbour/src/lang/msgca.c +++ b/harbour/src/lang/msgca.c @@ -200,19 +200,5 @@ static HB_LANG s_lang = } }; -HB_LANG_ANNOUNCE( CA ) - -HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_CA ) - hb_langRegister( &s_lang ); -HB_CALL_ON_STARTUP_END( hb_lang_Init_CA ) - -#if defined( HB_PRAGMA_STARTUP ) - #pragma startup hb_lang_Init_CA -#elif defined( HB_MSC_STARTUP ) - #if defined( HB_OS_WIN_64 ) - #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif - #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_hb_lang_Init_CA = hb_lang_Init_CA; - #pragma data_seg() -#endif +#define HB_LANG_ID CA +#include "hbmsgreg.h" diff --git a/harbour/src/lang/msgcs852.c b/harbour/src/lang/msgcs852.c index 4a9502ed2a..42b4becd1d 100644 --- a/harbour/src/lang/msgcs852.c +++ b/harbour/src/lang/msgcs852.c @@ -200,19 +200,5 @@ static HB_LANG s_lang = } }; -HB_LANG_ANNOUNCE( CS852 ) - -HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_CS852 ) - hb_langRegister( &s_lang ); -HB_CALL_ON_STARTUP_END( hb_lang_Init_CS852 ) - -#if defined( HB_PRAGMA_STARTUP ) - #pragma startup hb_lang_Init_CS852 -#elif defined( HB_MSC_STARTUP ) - #if defined( HB_OS_WIN_64 ) - #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif - #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_hb_lang_Init_CS852 = hb_lang_Init_CS852; - #pragma data_seg() -#endif +#define HB_LANG_ID CS852 +#include "hbmsgreg.h" diff --git a/harbour/src/lang/msgcsiso.c b/harbour/src/lang/msgcsiso.c index bef79b3c84..b818941cef 100644 --- a/harbour/src/lang/msgcsiso.c +++ b/harbour/src/lang/msgcsiso.c @@ -200,19 +200,5 @@ static HB_LANG s_lang = } }; -HB_LANG_ANNOUNCE( CSISO ) - -HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_CSISO ) - hb_langRegister( &s_lang ); -HB_CALL_ON_STARTUP_END( hb_lang_Init_CSISO ) - -#if defined( HB_PRAGMA_STARTUP ) - #pragma startup hb_lang_Init_CSISO -#elif defined( HB_MSC_STARTUP ) - #if defined( HB_OS_WIN_64 ) - #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif - #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_hb_lang_Init_CSISO = hb_lang_Init_CSISO; - #pragma data_seg() -#endif +#define HB_LANG_ID CSISO +#include "hbmsgreg.h" diff --git a/harbour/src/lang/msgcskam.c b/harbour/src/lang/msgcskam.c index 81ee064c68..c3c39fe88a 100644 --- a/harbour/src/lang/msgcskam.c +++ b/harbour/src/lang/msgcskam.c @@ -200,19 +200,5 @@ static HB_LANG s_lang = } }; -HB_LANG_ANNOUNCE( CSKAM ) - -HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_CSKAM ) - hb_langRegister( &s_lang ); -HB_CALL_ON_STARTUP_END( hb_lang_Init_CSKAM ) - -#if defined( HB_PRAGMA_STARTUP ) - #pragma startup hb_lang_Init_CSKAM -#elif defined( HB_MSC_STARTUP ) - #if defined( HB_OS_WIN_64 ) - #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif - #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_hb_lang_Init_CSKAM = hb_lang_Init_CSKAM; - #pragma data_seg() -#endif +#define HB_LANG_ID CSKAM +#include "hbmsgreg.h" diff --git a/harbour/src/lang/msgcswin.c b/harbour/src/lang/msgcswin.c index 85efad24fc..fc0ef6c197 100644 --- a/harbour/src/lang/msgcswin.c +++ b/harbour/src/lang/msgcswin.c @@ -201,19 +201,5 @@ static HB_LANG s_lang = } }; -HB_LANG_ANNOUNCE( CSWIN ) - -HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_CSWIN ) - hb_langRegister( &s_lang ); -HB_CALL_ON_STARTUP_END( hb_lang_Init_CSWIN ) - -#if defined( HB_PRAGMA_STARTUP ) - #pragma startup hb_lang_Init_CSWIN -#elif defined( HB_MSC_STARTUP ) - #if defined( HB_OS_WIN_64 ) - #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif - #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_hb_lang_Init_CSWIN = hb_lang_Init_CSWIN; - #pragma data_seg() -#endif +#define HB_LANG_ID CSWIN +#include "hbmsgreg.h" diff --git a/harbour/src/lang/msgde.c b/harbour/src/lang/msgde.c index 8b02e27409..70fe68022a 100644 --- a/harbour/src/lang/msgde.c +++ b/harbour/src/lang/msgde.c @@ -200,19 +200,5 @@ static HB_LANG s_lang = } }; -HB_LANG_ANNOUNCE( DE ) - -HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_DE ) - hb_langRegister( &s_lang ); -HB_CALL_ON_STARTUP_END( hb_lang_Init_DE ) - -#if defined( HB_PRAGMA_STARTUP ) - #pragma startup hb_lang_Init_DE -#elif defined( HB_MSC_STARTUP ) - #if defined( HB_OS_WIN_64 ) - #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif - #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_hb_lang_Init_DE = hb_lang_Init_DE; - #pragma data_seg() -#endif +#define HB_LANG_ID DE +#include "hbmsgreg.h" diff --git a/harbour/src/lang/msgdewin.c b/harbour/src/lang/msgdewin.c index 1ae8d8f74d..900c834072 100644 --- a/harbour/src/lang/msgdewin.c +++ b/harbour/src/lang/msgdewin.c @@ -201,19 +201,5 @@ static HB_LANG s_lang = } }; -HB_LANG_ANNOUNCE( DEWIN ) - -HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_DEWIN ) - hb_langRegister( &s_lang ); -HB_CALL_ON_STARTUP_END( hb_lang_Init_DEWIN ) - -#if defined( HB_PRAGMA_STARTUP ) - #pragma startup hb_lang_Init_DEWIN -#elif defined( HB_MSC_STARTUP ) - #if defined( HB_OS_WIN_64 ) - #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif - #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_hb_lang_Init_DEWIN = hb_lang_Init_DEWIN; - #pragma data_seg() -#endif +#define HB_LANG_ID DEWIN +#include "hbmsgreg.h" diff --git a/harbour/src/lang/msgel.c b/harbour/src/lang/msgel.c index 217e768af4..046cfe0c75 100644 --- a/harbour/src/lang/msgel.c +++ b/harbour/src/lang/msgel.c @@ -200,19 +200,5 @@ static HB_LANG s_lang = } }; -HB_LANG_ANNOUNCE( EL ) - -HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_EL ) - hb_langRegister( &s_lang ); -HB_CALL_ON_STARTUP_END( hb_lang_Init_EL ) - -#if defined( HB_PRAGMA_STARTUP ) - #pragma startup hb_lang_Init_EL -#elif defined( HB_MSC_STARTUP ) - #if defined( HB_OS_WIN_64 ) - #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif - #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_hb_lang_Init_EL = hb_lang_Init_EL; - #pragma data_seg() -#endif +#define HB_LANG_ID EL +#include "hbmsgreg.h" diff --git a/harbour/src/lang/msgelwin.c b/harbour/src/lang/msgelwin.c index b655caa479..37ec22b38d 100644 --- a/harbour/src/lang/msgelwin.c +++ b/harbour/src/lang/msgelwin.c @@ -200,19 +200,5 @@ static HB_LANG s_lang = } }; -HB_LANG_ANNOUNCE( ELWIN ) - -HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_ELWIN ) - hb_langRegister( &s_lang ); -HB_CALL_ON_STARTUP_END( hb_lang_Init_ELWIN ) - -#if defined( HB_PRAGMA_STARTUP ) - #pragma startup hb_lang_Init_ELWIN -#elif defined( HB_MSC_STARTUP ) - #if defined( HB_OS_WIN_64 ) - #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif - #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_hb_lang_Init_ELWIN = hb_lang_Init_ELWIN; - #pragma data_seg() -#endif +#define HB_LANG_ID ELWIN +#include "hbmsgreg.h" diff --git a/harbour/src/lang/msgeo.c b/harbour/src/lang/msgeo.c index 7b50e971cf..c0f4eb8005 100644 --- a/harbour/src/lang/msgeo.c +++ b/harbour/src/lang/msgeo.c @@ -202,19 +202,5 @@ static HB_LANG s_lang = } }; -HB_LANG_ANNOUNCE( EO ) - -HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_EO ) - hb_langRegister( &s_lang ); -HB_CALL_ON_STARTUP_END( hb_lang_Init_EO ) - -#if defined( HB_PRAGMA_STARTUP ) - #pragma startup hb_lang_Init_EO -#elif defined( HB_MSC_STARTUP ) - #if defined( HB_OS_WIN_64 ) - #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif - #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_hb_lang_Init_EO = hb_lang_Init_EO; - #pragma data_seg() -#endif +#define HB_LANG_ID EO +#include "hbmsgreg.h" diff --git a/harbour/src/lang/msges.c b/harbour/src/lang/msges.c index 8b70059d23..5187a20644 100644 --- a/harbour/src/lang/msges.c +++ b/harbour/src/lang/msges.c @@ -200,19 +200,5 @@ static HB_LANG s_lang = } }; -HB_LANG_ANNOUNCE( ES ) - -HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_ES ) - hb_langRegister( &s_lang ); -HB_CALL_ON_STARTUP_END( hb_lang_Init_ES ) - -#if defined( HB_PRAGMA_STARTUP ) - #pragma startup hb_lang_Init_ES -#elif defined( HB_MSC_STARTUP ) - #if defined( HB_OS_WIN_64 ) - #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif - #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_hb_lang_Init_ES = hb_lang_Init_ES; - #pragma data_seg() -#endif +#define HB_LANG_ID ES +#include "hbmsgreg.h" diff --git a/harbour/src/lang/msgeswin.c b/harbour/src/lang/msgeswin.c index 1cbe4fff3a..9adf9456dc 100644 --- a/harbour/src/lang/msgeswin.c +++ b/harbour/src/lang/msgeswin.c @@ -201,19 +201,5 @@ static HB_LANG s_lang = } }; -HB_LANG_ANNOUNCE( ESWIN ) - -HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_ESWIN ) - hb_langRegister( &s_lang ); -HB_CALL_ON_STARTUP_END( hb_lang_Init_ESWIN ) - -#if defined( HB_PRAGMA_STARTUP ) - #pragma startup hb_lang_Init_ESWIN -#elif defined( HB_MSC_STARTUP ) - #if defined( HB_OS_WIN_64 ) - #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif - #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_hb_lang_Init_ESWIN = hb_lang_Init_ESWIN; - #pragma data_seg() -#endif +#define HB_LANG_ID ESWIN +#include "hbmsgreg.h" diff --git a/harbour/src/lang/msgeu.c b/harbour/src/lang/msgeu.c index d579db5176..525e599c88 100644 --- a/harbour/src/lang/msgeu.c +++ b/harbour/src/lang/msgeu.c @@ -200,19 +200,5 @@ static HB_LANG s_lang = } }; -HB_LANG_ANNOUNCE( EU ) - -HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_EU ) - hb_langRegister( &s_lang ); -HB_CALL_ON_STARTUP_END( hb_lang_Init_EU ) - -#if defined( HB_PRAGMA_STARTUP ) - #pragma startup hb_lang_Init_EU -#elif defined( HB_MSC_STARTUP ) - #if defined( HB_OS_WIN_64 ) - #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif - #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_hb_lang_Init_EU = hb_lang_Init_EU; - #pragma data_seg() -#endif +#define HB_LANG_ID EU +#include "hbmsgreg.h" diff --git a/harbour/src/lang/msgfr.c b/harbour/src/lang/msgfr.c index b21cf53c73..fc328881c3 100644 --- a/harbour/src/lang/msgfr.c +++ b/harbour/src/lang/msgfr.c @@ -200,19 +200,5 @@ static HB_LANG s_lang = } }; -HB_LANG_ANNOUNCE( FR ) - -HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_FR ) - hb_langRegister( &s_lang ); -HB_CALL_ON_STARTUP_END( hb_lang_Init_FR ) - -#if defined( HB_PRAGMA_STARTUP ) - #pragma startup hb_lang_Init_FR -#elif defined( HB_MSC_STARTUP ) - #if defined( HB_OS_WIN_64 ) - #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif - #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_hb_lang_Init_FR = hb_lang_Init_FR; - #pragma data_seg() -#endif +#define HB_LANG_ID FR +#include "hbmsgreg.h" diff --git a/harbour/src/lang/msggl.c b/harbour/src/lang/msggl.c index b10aeb4c36..dae4eddf9f 100644 --- a/harbour/src/lang/msggl.c +++ b/harbour/src/lang/msggl.c @@ -200,19 +200,5 @@ static HB_LANG s_lang = } }; -HB_LANG_ANNOUNCE( GL ) - -HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_GL ) - hb_langRegister( &s_lang ); -HB_CALL_ON_STARTUP_END( hb_lang_Init_GL ) - -#if defined( HB_PRAGMA_STARTUP ) - #pragma startup hb_lang_Init_GL -#elif defined( HB_MSC_STARTUP ) - #if defined( HB_OS_WIN_64 ) - #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif - #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_hb_lang_Init_GL = hb_lang_Init_GL; - #pragma data_seg() -#endif +#define HB_LANG_ID GL +#include "hbmsgreg.h" diff --git a/harbour/src/lang/msghe862.c b/harbour/src/lang/msghe862.c index c9e1aa1599..f3113838d2 100644 --- a/harbour/src/lang/msghe862.c +++ b/harbour/src/lang/msghe862.c @@ -201,19 +201,5 @@ static HB_LANG s_lang = } }; -HB_LANG_ANNOUNCE( HE862 ) - -HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_HE862 ) - hb_langRegister( &s_lang ); -HB_CALL_ON_STARTUP_END( hb_lang_Init_HE862 ) - -#if defined( HB_PRAGMA_STARTUP ) - #pragma startup hb_lang_Init_HE862 -#elif defined( HB_MSC_STARTUP ) - #if defined( HB_OS_WIN_64 ) - #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif - #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_hb_lang_Init_HE862 = hb_lang_Init_HE862; - #pragma data_seg() -#endif +#define HB_LANG_ID HE862 +#include "hbmsgreg.h" diff --git a/harbour/src/lang/msghewin.c b/harbour/src/lang/msghewin.c index af93311ce8..9ed5bf4335 100644 --- a/harbour/src/lang/msghewin.c +++ b/harbour/src/lang/msghewin.c @@ -201,19 +201,5 @@ static HB_LANG s_lang = } }; -HB_LANG_ANNOUNCE( HEWIN ) - -HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_HEWIN ) - hb_langRegister( &s_lang ); -HB_CALL_ON_STARTUP_END( hb_lang_Init_HEWIN ) - -#if defined( HB_PRAGMA_STARTUP ) - #pragma startup hb_lang_Init_HEWIN -#elif defined( HB_MSC_STARTUP ) - #if defined( HB_OS_WIN_64 ) - #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif - #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_hb_lang_Init_HEWIN = hb_lang_Init_HEWIN; - #pragma data_seg() -#endif +#define HB_LANG_ID HEWIN +#include "hbmsgreg.h" diff --git a/harbour/src/lang/msghr437.c b/harbour/src/lang/msghr437.c index 46ed09d3b6..c633991b1f 100644 --- a/harbour/src/lang/msghr437.c +++ b/harbour/src/lang/msghr437.c @@ -200,19 +200,5 @@ static HB_LANG s_lang = } }; -HB_LANG_ANNOUNCE( HR437 ) - -HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_HR437 ) - hb_langRegister( &s_lang ); -HB_CALL_ON_STARTUP_END( hb_lang_Init_HR437 ) - -#if defined( HB_PRAGMA_STARTUP ) - #pragma startup hb_lang_Init_HR437 -#elif defined( HB_MSC_STARTUP ) - #if defined( HB_OS_WIN_64 ) - #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif - #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_hb_lang_Init_HR437 = hb_lang_Init_HR437; - #pragma data_seg() -#endif +#define HB_LANG_ID HR437 +#include "hbmsgreg.h" diff --git a/harbour/src/lang/msghr852.c b/harbour/src/lang/msghr852.c index a9b42ea8db..56d279bc4d 100644 --- a/harbour/src/lang/msghr852.c +++ b/harbour/src/lang/msghr852.c @@ -201,19 +201,5 @@ static HB_LANG s_lang = } }; -HB_LANG_ANNOUNCE( HR852 ) - -HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_HR852 ) - hb_langRegister( &s_lang ); -HB_CALL_ON_STARTUP_END( hb_lang_Init_HR852 ) - -#if defined( HB_PRAGMA_STARTUP ) - #pragma startup hb_lang_Init_HR852 -#elif defined( HB_MSC_STARTUP ) - #if defined( HB_OS_WIN_64 ) - #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif - #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_hb_lang_Init_HR852 = hb_lang_Init_HR852; - #pragma data_seg() -#endif +#define HB_LANG_ID HR852 +#include "hbmsgreg.h" diff --git a/harbour/src/lang/msghriso.c b/harbour/src/lang/msghriso.c index 4310be5680..2418ceea34 100644 --- a/harbour/src/lang/msghriso.c +++ b/harbour/src/lang/msghriso.c @@ -201,19 +201,5 @@ static HB_LANG s_lang = } }; -HB_LANG_ANNOUNCE( HRISO ) - -HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_HRISO ) - hb_langRegister( &s_lang ); -HB_CALL_ON_STARTUP_END( hb_lang_Init_HRISO ) - -#if defined( HB_PRAGMA_STARTUP ) - #pragma startup hb_lang_Init_HRISO -#elif defined( HB_MSC_STARTUP ) - #if defined( HB_OS_WIN_64 ) - #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif - #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_hb_lang_Init_HRISO = hb_lang_Init_HRISO; - #pragma data_seg() -#endif +#define HB_LANG_ID HRISO +#include "hbmsgreg.h" diff --git a/harbour/src/lang/msghrwin.c b/harbour/src/lang/msghrwin.c index bbc6934f99..22b7cd4fbe 100644 --- a/harbour/src/lang/msghrwin.c +++ b/harbour/src/lang/msghrwin.c @@ -202,19 +202,5 @@ static HB_LANG s_lang = } }; -HB_LANG_ANNOUNCE( HRWIN ) - -HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_HRWIN ) - hb_langRegister( &s_lang ); -HB_CALL_ON_STARTUP_END( hb_lang_Init_HRWIN ) - -#if defined( HB_PRAGMA_STARTUP ) - #pragma startup hb_lang_Init_HRWIN -#elif defined( HB_MSC_STARTUP ) - #if defined( HB_OS_WIN_64 ) - #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif - #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_hb_lang_Init_HRWIN = hb_lang_Init_HRWIN; - #pragma data_seg() -#endif +#define HB_LANG_ID HRWIN +#include "hbmsgreg.h" diff --git a/harbour/src/lang/msghu852.c b/harbour/src/lang/msghu852.c index a6f7b14638..8492ab7da3 100644 --- a/harbour/src/lang/msghu852.c +++ b/harbour/src/lang/msghu852.c @@ -200,19 +200,5 @@ static HB_LANG s_lang = } }; -HB_LANG_ANNOUNCE( HU852 ) - -HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_HU852 ) - hb_langRegister( &s_lang ); -HB_CALL_ON_STARTUP_END( hb_lang_Init_HU852 ) - -#if defined( HB_PRAGMA_STARTUP ) - #pragma startup hb_lang_Init_HU852 -#elif defined( HB_MSC_STARTUP ) - #if defined( HB_OS_WIN_64 ) - #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif - #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_hb_lang_Init_HU852 = hb_lang_Init_HU852; - #pragma data_seg() -#endif +#define HB_LANG_ID HU852 +#include "hbmsgreg.h" diff --git a/harbour/src/lang/msghucwi.c b/harbour/src/lang/msghucwi.c index ef0ccf0712..c3e96e71fc 100644 --- a/harbour/src/lang/msghucwi.c +++ b/harbour/src/lang/msghucwi.c @@ -200,19 +200,5 @@ static HB_LANG s_lang = } }; -HB_LANG_ANNOUNCE( HUCWI ) - -HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_HUCWI ) - hb_langRegister( &s_lang ); -HB_CALL_ON_STARTUP_END( hb_lang_Init_HUCWI ) - -#if defined( HB_PRAGMA_STARTUP ) - #pragma startup hb_lang_Init_HUCWI -#elif defined( HB_MSC_STARTUP ) - #if defined( HB_OS_WIN_64 ) - #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif - #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_hb_lang_Init_HUCWI = hb_lang_Init_HUCWI; - #pragma data_seg() -#endif +#define HB_LANG_ID HUCWI +#include "hbmsgreg.h" diff --git a/harbour/src/lang/msghuiso.c b/harbour/src/lang/msghuiso.c index 4b986d820e..f09596fbf0 100644 --- a/harbour/src/lang/msghuiso.c +++ b/harbour/src/lang/msghuiso.c @@ -200,19 +200,5 @@ static HB_LANG s_lang = } }; -HB_LANG_ANNOUNCE( HUISO ) - -HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_HUISO ) - hb_langRegister( &s_lang ); -HB_CALL_ON_STARTUP_END( hb_lang_Init_HUISO ) - -#if defined( HB_PRAGMA_STARTUP ) - #pragma startup hb_lang_Init_HUISO -#elif defined( HB_MSC_STARTUP ) - #if defined( HB_OS_WIN_64 ) - #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif - #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_hb_lang_Init_HUISO = hb_lang_Init_HUISO; - #pragma data_seg() -#endif +#define HB_LANG_ID HUISO +#include "hbmsgreg.h" diff --git a/harbour/src/lang/msghuwin.c b/harbour/src/lang/msghuwin.c index 561fce0ce5..18c7aa9ffd 100644 --- a/harbour/src/lang/msghuwin.c +++ b/harbour/src/lang/msghuwin.c @@ -200,19 +200,5 @@ static HB_LANG s_lang = } }; -HB_LANG_ANNOUNCE( HUWIN ) - -HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_HUWIN ) - hb_langRegister( &s_lang ); -HB_CALL_ON_STARTUP_END( hb_lang_Init_HUWIN ) - -#if defined( HB_PRAGMA_STARTUP ) - #pragma startup hb_lang_Init_HUWIN -#elif defined( HB_MSC_STARTUP ) - #if defined( HB_OS_WIN_64 ) - #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif - #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_hb_lang_Init_HUWIN = hb_lang_Init_HUWIN; - #pragma data_seg() -#endif +#define HB_LANG_ID HUWIN +#include "hbmsgreg.h" diff --git a/harbour/src/lang/msgid.c b/harbour/src/lang/msgid.c index 2d4a72e41c..70d6ef0e5a 100644 --- a/harbour/src/lang/msgid.c +++ b/harbour/src/lang/msgid.c @@ -200,19 +200,5 @@ static HB_LANG s_lang = } }; -HB_LANG_ANNOUNCE( ID ) - -HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_ID ) - hb_langRegister( &s_lang ); -HB_CALL_ON_STARTUP_END( hb_lang_Init_ID ) - -#if defined( HB_PRAGMA_STARTUP ) - #pragma startup hb_lang_Init_ID -#elif defined( HB_MSC_STARTUP ) - #if defined( HB_OS_WIN_64 ) - #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif - #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_hb_lang_Init_ID = hb_lang_Init_ID; - #pragma data_seg() -#endif +#define HB_LANG_ID ID +#include "hbmsgreg.h" diff --git a/harbour/src/lang/msgis850.c b/harbour/src/lang/msgis850.c index 8835a0d4ca..a2d503accc 100644 --- a/harbour/src/lang/msgis850.c +++ b/harbour/src/lang/msgis850.c @@ -201,19 +201,5 @@ static HB_LANG s_lang = } }; -HB_LANG_ANNOUNCE( IS850 ) - -HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_IS850 ) - hb_langRegister( &s_lang ); -HB_CALL_ON_STARTUP_END( hb_lang_Init_IS850 ) - -#if defined( HB_PRAGMA_STARTUP ) - #pragma startup hb_lang_Init_IS850 -#elif defined( HB_MSC_STARTUP ) - #if defined( HB_OS_WIN_64 ) - #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif - #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_hb_lang_Init_IS850 = hb_lang_Init_IS850; - #pragma data_seg() -#endif +#define HB_LANG_ID IS850 +#include "hbmsgreg.h" diff --git a/harbour/src/lang/msgit.c b/harbour/src/lang/msgit.c index 44b9bb3348..07feb56a1d 100644 --- a/harbour/src/lang/msgit.c +++ b/harbour/src/lang/msgit.c @@ -200,19 +200,5 @@ static HB_LANG s_lang = } }; -HB_LANG_ANNOUNCE( IT ) - -HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_IT ) - hb_langRegister( &s_lang ); -HB_CALL_ON_STARTUP_END( hb_lang_Init_IT ) - -#if defined( HB_PRAGMA_STARTUP ) - #pragma startup hb_lang_Init_IT -#elif defined( HB_MSC_STARTUP ) - #if defined( HB_OS_WIN_64 ) - #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif - #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_hb_lang_Init_IT = hb_lang_Init_IT; - #pragma data_seg() -#endif +#define HB_LANG_ID IT +#include "hbmsgreg.h" diff --git a/harbour/src/lang/msgko.c b/harbour/src/lang/msgko.c index 4821508d13..9a36b1a0b4 100644 --- a/harbour/src/lang/msgko.c +++ b/harbour/src/lang/msgko.c @@ -200,19 +200,5 @@ static HB_LANG s_lang = } }; -HB_LANG_ANNOUNCE( KO ) - -HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_KO ) - hb_langRegister( &s_lang ); -HB_CALL_ON_STARTUP_END( hb_lang_Init_KO ) - -#if defined( HB_PRAGMA_STARTUP ) - #pragma startup hb_lang_Init_KO -#elif defined( HB_MSC_STARTUP ) - #if defined( HB_OS_WIN_64 ) - #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif - #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_hb_lang_Init_KO = hb_lang_Init_KO; - #pragma data_seg() -#endif +#define HB_LANG_ID KO +#include "hbmsgreg.h" diff --git a/harbour/src/lang/msgltwin.c b/harbour/src/lang/msgltwin.c index 881bf02981..d26ce02d71 100644 --- a/harbour/src/lang/msgltwin.c +++ b/harbour/src/lang/msgltwin.c @@ -200,19 +200,5 @@ static HB_LANG s_lang = } }; -HB_LANG_ANNOUNCE( LTWIN ) - -HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_LTWIN ) - hb_langRegister( &s_lang ); -HB_CALL_ON_STARTUP_END( hb_lang_Init_LTWIN ) - -#if defined( HB_PRAGMA_STARTUP ) - #pragma startup hb_lang_Init_LTWIN -#elif defined( HB_MSC_STARTUP ) - #if defined( HB_OS_WIN_64 ) - #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif - #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_hb_lang_Init_LTWIN = hb_lang_Init_LTWIN; - #pragma data_seg() -#endif +#define HB_LANG_ID LTWIN +#include "hbmsgreg.h" diff --git a/harbour/src/lang/msgnl.c b/harbour/src/lang/msgnl.c index 58240f941b..c7a404d3b7 100644 --- a/harbour/src/lang/msgnl.c +++ b/harbour/src/lang/msgnl.c @@ -200,19 +200,5 @@ static HB_LANG s_lang = } }; -HB_LANG_ANNOUNCE( NL ) - -HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_NL ) - hb_langRegister( &s_lang ); -HB_CALL_ON_STARTUP_END( hb_lang_Init_NL ) - -#if defined( HB_PRAGMA_STARTUP ) - #pragma startup hb_lang_Init_NL -#elif defined( HB_MSC_STARTUP ) - #if defined( HB_OS_WIN_64 ) - #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif - #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_hb_lang_Init_NL = hb_lang_Init_NL; - #pragma data_seg() -#endif +#define HB_LANG_ID NL +#include "hbmsgreg.h" diff --git a/harbour/src/lang/msgpl852.c b/harbour/src/lang/msgpl852.c index 41f9db8848..58771349f5 100644 --- a/harbour/src/lang/msgpl852.c +++ b/harbour/src/lang/msgpl852.c @@ -200,19 +200,5 @@ static HB_LANG s_lang = } }; -HB_LANG_ANNOUNCE( PL852 ) - -HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_PL852 ) - hb_langRegister( &s_lang ); -HB_CALL_ON_STARTUP_END( hb_lang_Init_PL852 ) - -#if defined( HB_PRAGMA_STARTUP ) - #pragma startup hb_lang_Init_PL852 -#elif defined( HB_MSC_STARTUP ) - #if defined( HB_OS_WIN_64 ) - #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif - #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_hb_lang_Init_PL852 = hb_lang_Init_PL852; - #pragma data_seg() -#endif +#define HB_LANG_ID PL852 +#include "hbmsgreg.h" diff --git a/harbour/src/lang/msgpliso.c b/harbour/src/lang/msgpliso.c index 6f2fa389f5..52445f612a 100644 --- a/harbour/src/lang/msgpliso.c +++ b/harbour/src/lang/msgpliso.c @@ -200,19 +200,5 @@ static HB_LANG s_lang = } }; -HB_LANG_ANNOUNCE( PLISO ) - -HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_PLISO ) - hb_langRegister( &s_lang ); -HB_CALL_ON_STARTUP_END( hb_lang_Init_PLISO ) - -#if defined( HB_PRAGMA_STARTUP ) - #pragma startup hb_lang_Init_PLISO -#elif defined( HB_MSC_STARTUP ) - #if defined( HB_OS_WIN_64 ) - #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif - #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_hb_lang_Init_PLISO = hb_lang_Init_PLISO; - #pragma data_seg() -#endif +#define HB_LANG_ID PLISO +#include "hbmsgreg.h" diff --git a/harbour/src/lang/msgplmaz.c b/harbour/src/lang/msgplmaz.c index dfc3608b2b..eb5d238ce2 100644 --- a/harbour/src/lang/msgplmaz.c +++ b/harbour/src/lang/msgplmaz.c @@ -200,19 +200,5 @@ static HB_LANG s_lang = } }; -HB_LANG_ANNOUNCE( PLMAZ ) - -HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_PLMAZ ) - hb_langRegister( &s_lang ); -HB_CALL_ON_STARTUP_END( hb_lang_Init_PLMAZ ) - -#if defined( HB_PRAGMA_STARTUP ) - #pragma startup hb_lang_Init_PLMAZ -#elif defined( HB_MSC_STARTUP ) - #if defined( HB_OS_WIN_64 ) - #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif - #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_hb_lang_Init_PLMAZ = hb_lang_Init_PLMAZ; - #pragma data_seg() -#endif +#define HB_LANG_ID PLMAZ +#include "hbmsgreg.h" diff --git a/harbour/src/lang/msgplwin.c b/harbour/src/lang/msgplwin.c index 45165d1db5..e9833008d5 100644 --- a/harbour/src/lang/msgplwin.c +++ b/harbour/src/lang/msgplwin.c @@ -200,19 +200,5 @@ static HB_LANG s_lang = } }; -HB_LANG_ANNOUNCE( PLWIN ) - -HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_PLWIN ) - hb_langRegister( &s_lang ); -HB_CALL_ON_STARTUP_END( hb_lang_Init_PLWIN ) - -#if defined( HB_PRAGMA_STARTUP ) - #pragma startup hb_lang_Init_PLWIN -#elif defined( HB_MSC_STARTUP ) - #if defined( HB_OS_WIN_64 ) - #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif - #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_hb_lang_Init_PLWIN = hb_lang_Init_PLWIN; - #pragma data_seg() -#endif +#define HB_LANG_ID PLWIN +#include "hbmsgreg.h" diff --git a/harbour/src/lang/msgpt.c b/harbour/src/lang/msgpt.c index 7fdc49f5d9..97be078b7a 100644 --- a/harbour/src/lang/msgpt.c +++ b/harbour/src/lang/msgpt.c @@ -212,19 +212,5 @@ static HB_LANG s_lang = } }; -HB_LANG_ANNOUNCE( PT ) - -HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_PT ) - hb_langRegister( &s_lang ); -HB_CALL_ON_STARTUP_END( hb_lang_Init_PT ) - -#if defined( HB_PRAGMA_STARTUP ) - #pragma startup hb_lang_Init_PT -#elif defined( HB_MSC_STARTUP ) - #if defined( HB_OS_WIN_64 ) - #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif - #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_hb_lang_Init_PT = hb_lang_Init_PT; - #pragma data_seg() -#endif +#define HB_LANG_ID PT +#include "hbmsgreg.h" diff --git a/harbour/src/lang/msgptiso.c b/harbour/src/lang/msgptiso.c index 7d6bcd25f0..82b919a46b 100644 --- a/harbour/src/lang/msgptiso.c +++ b/harbour/src/lang/msgptiso.c @@ -212,19 +212,5 @@ static HB_LANG s_lang = } }; -HB_LANG_ANNOUNCE( PTISO ) - -HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_PTISO ) - hb_langRegister( &s_lang ); -HB_CALL_ON_STARTUP_END( hb_lang_Init_PTISO ) - -#if defined( HB_PRAGMA_STARTUP ) - #pragma startup hb_lang_Init_PTISO -#elif defined( HB_MSC_STARTUP ) - #if defined( HB_OS_WIN_64 ) - #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif - #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_hb_lang_Init_PTISO = hb_lang_Init_PTISO; - #pragma data_seg() -#endif +#define HB_LANG_ID PTISO +#include "hbmsgreg.h" diff --git a/harbour/src/lang/msgro.c b/harbour/src/lang/msgro.c index f16d1f338e..b7c0521558 100644 --- a/harbour/src/lang/msgro.c +++ b/harbour/src/lang/msgro.c @@ -200,19 +200,5 @@ static HB_LANG s_lang = } }; -HB_LANG_ANNOUNCE( RO ) - -HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_RO ) - hb_langRegister( &s_lang ); -HB_CALL_ON_STARTUP_END( hb_lang_Init_RO ) - -#if defined( HB_PRAGMA_STARTUP ) - #pragma startup hb_lang_Init_RO -#elif defined( HB_MSC_STARTUP ) - #if defined( HB_OS_WIN_64 ) - #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif - #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_hb_lang_Init_RO = hb_lang_Init_RO; - #pragma data_seg() -#endif +#define HB_LANG_ID RO +#include "hbmsgreg.h" diff --git a/harbour/src/lang/msgru866.c b/harbour/src/lang/msgru866.c index c22182af4e..1c194d7bb8 100644 --- a/harbour/src/lang/msgru866.c +++ b/harbour/src/lang/msgru866.c @@ -201,19 +201,5 @@ static HB_LANG s_lang = } }; -HB_LANG_ANNOUNCE( RU866 ) - -HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_RU866 ) - hb_langRegister( &s_lang ); -HB_CALL_ON_STARTUP_END( hb_lang_Init_RU866 ) - -#if defined( HB_PRAGMA_STARTUP ) - #pragma startup hb_lang_Init_RU866 -#elif defined( HB_MSC_STARTUP ) - #if defined( HB_OS_WIN_64 ) - #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif - #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_hb_lang_Init_RU866 = hb_lang_Init_RU866; - #pragma data_seg() -#endif +#define HB_LANG_ID RU866 +#include "hbmsgreg.h" diff --git a/harbour/src/lang/msgrukoi.c b/harbour/src/lang/msgrukoi.c index da95a1b7b4..5f36ccef06 100644 --- a/harbour/src/lang/msgrukoi.c +++ b/harbour/src/lang/msgrukoi.c @@ -200,19 +200,5 @@ static HB_LANG s_lang = } }; -HB_LANG_ANNOUNCE( RUKOI8 ) - -HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_RUKOI8 ) - hb_langRegister( &s_lang ); -HB_CALL_ON_STARTUP_END( hb_lang_Init_RUKOI8 ) - -#if defined( HB_PRAGMA_STARTUP ) - #pragma startup hb_lang_Init_RUKOI8 -#elif defined( HB_MSC_STARTUP ) - #if defined( HB_OS_WIN_64 ) - #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif - #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_hb_lang_Init_RUKOI8 = hb_lang_Init_RUKOI8; - #pragma data_seg() -#endif +#define HB_LANG_ID RUKOI8 +#include "hbmsgreg.h" diff --git a/harbour/src/lang/msgruwin.c b/harbour/src/lang/msgruwin.c index 585cdf58f1..9fad69dffc 100644 --- a/harbour/src/lang/msgruwin.c +++ b/harbour/src/lang/msgruwin.c @@ -201,19 +201,5 @@ static HB_LANG s_lang = } }; -HB_LANG_ANNOUNCE( RUWIN ) - -HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_RUWIN ) - hb_langRegister( &s_lang ); -HB_CALL_ON_STARTUP_END( hb_lang_Init_RUWIN ) - -#if defined( HB_PRAGMA_STARTUP ) - #pragma startup hb_lang_Init_RUWIN -#elif defined( HB_MSC_STARTUP ) - #if defined( HB_OS_WIN_64 ) - #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif - #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_hb_lang_Init_RUWIN = hb_lang_Init_RUWIN; - #pragma data_seg() -#endif +#define HB_LANG_ID RUWIN +#include "hbmsgreg.h" diff --git a/harbour/src/lang/msgsk852.c b/harbour/src/lang/msgsk852.c index 1d829d15c7..276be1ede8 100644 --- a/harbour/src/lang/msgsk852.c +++ b/harbour/src/lang/msgsk852.c @@ -199,19 +199,5 @@ static HB_LANG s_lang = } }; -HB_LANG_ANNOUNCE( SK852 ) - -HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_SK852 ) - hb_langRegister( &s_lang ); -HB_CALL_ON_STARTUP_END( hb_lang_Init_SK852 ) - -#if defined( HB_PRAGMA_STARTUP ) - #pragma startup hb_lang_Init_SK852 -#elif defined( HB_MSC_STARTUP ) - #if defined( HB_OS_WIN_64 ) - #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif - #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_hb_lang_Init_SK852 = hb_lang_Init_SK852; - #pragma data_seg() -#endif +#define HB_LANG_ID SK852 +#include "hbmsgreg.h" diff --git a/harbour/src/lang/msgskiso.c b/harbour/src/lang/msgskiso.c index daf0e32e4b..1335a0c3e4 100644 --- a/harbour/src/lang/msgskiso.c +++ b/harbour/src/lang/msgskiso.c @@ -199,19 +199,5 @@ static HB_LANG s_lang = } }; -HB_LANG_ANNOUNCE( SKISO ) - -HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_SKISO ) - hb_langRegister( &s_lang ); -HB_CALL_ON_STARTUP_END( hb_lang_Init_SKISO ) - -#if defined( HB_PRAGMA_STARTUP ) - #pragma startup hb_lang_Init_SKISO -#elif defined( HB_MSC_STARTUP ) - #if defined( HB_OS_WIN_64 ) - #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif - #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_hb_lang_Init_SKISO = hb_lang_Init_SKISO; - #pragma data_seg() -#endif +#define HB_LANG_ID SKISO +#include "hbmsgreg.h" diff --git a/harbour/src/lang/msgskkam.c b/harbour/src/lang/msgskkam.c index ea3c709a1d..6a06206f3a 100644 --- a/harbour/src/lang/msgskkam.c +++ b/harbour/src/lang/msgskkam.c @@ -199,19 +199,5 @@ static HB_LANG s_lang = } }; -HB_LANG_ANNOUNCE( SKKAM ) - -HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_SKKAM ) - hb_langRegister( &s_lang ); -HB_CALL_ON_STARTUP_END( hb_lang_Init_SKKAM ) - -#if defined( HB_PRAGMA_STARTUP ) - #pragma startup hb_lang_Init_SKKAM -#elif defined( HB_MSC_STARTUP ) - #if defined( HB_OS_WIN_64 ) - #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif - #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_hb_lang_Init_SKKAM = hb_lang_Init_SKKAM; - #pragma data_seg() -#endif +#define HB_LANG_ID SKKAM +#include "hbmsgreg.h" diff --git a/harbour/src/lang/msgskwin.c b/harbour/src/lang/msgskwin.c index d13b8570c2..1c19e67f07 100644 --- a/harbour/src/lang/msgskwin.c +++ b/harbour/src/lang/msgskwin.c @@ -199,19 +199,5 @@ static HB_LANG s_lang = } }; -HB_LANG_ANNOUNCE( SKWIN ) - -HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_SKWIN ) - hb_langRegister( &s_lang ); -HB_CALL_ON_STARTUP_END( hb_lang_Init_SKWIN ) - -#if defined( HB_PRAGMA_STARTUP ) - #pragma startup hb_lang_Init_SKWIN -#elif defined( HB_MSC_STARTUP ) - #if defined( HB_OS_WIN_64 ) - #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif - #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_hb_lang_Init_SKWIN = hb_lang_Init_SKWIN; - #pragma data_seg() -#endif +#define HB_LANG_ID SKWIN +#include "hbmsgreg.h" diff --git a/harbour/src/lang/msgsl437.c b/harbour/src/lang/msgsl437.c index 64a1e2d008..5e4f7ff7a8 100644 --- a/harbour/src/lang/msgsl437.c +++ b/harbour/src/lang/msgsl437.c @@ -201,19 +201,5 @@ static HB_LANG s_lang = } }; -HB_LANG_ANNOUNCE( SL437 ) - -HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_SL437 ) - hb_langRegister( &s_lang ); -HB_CALL_ON_STARTUP_END( hb_lang_Init_SL437 ) - -#if defined( HB_PRAGMA_STARTUP ) - #pragma startup hb_lang_Init_SL437 -#elif defined( HB_MSC_STARTUP ) - #if defined( HB_OS_WIN_64 ) - #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif - #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_hb_lang_Init_SL437 = hb_lang_Init_SL437; - #pragma data_seg() -#endif +#define HB_LANG_ID SL437 +#include "hbmsgreg.h" diff --git a/harbour/src/lang/msgsl852.c b/harbour/src/lang/msgsl852.c index 1bd60d02c3..827c85fd17 100644 --- a/harbour/src/lang/msgsl852.c +++ b/harbour/src/lang/msgsl852.c @@ -200,19 +200,5 @@ static HB_LANG s_lang = } }; -HB_LANG_ANNOUNCE( SL852 ) - -HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_SL852 ) - hb_langRegister( &s_lang ); -HB_CALL_ON_STARTUP_END( hb_lang_Init_SL852 ) - -#if defined( HB_PRAGMA_STARTUP ) - #pragma startup hb_lang_Init_SL852 -#elif defined( HB_MSC_STARTUP ) - #if defined( HB_OS_WIN_64 ) - #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif - #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_hb_lang_Init_SL852 = hb_lang_Init_SL852; - #pragma data_seg() -#endif +#define HB_LANG_ID SL852 +#include "hbmsgreg.h" diff --git a/harbour/src/lang/msgsliso.c b/harbour/src/lang/msgsliso.c index 35a708b7bc..54bb8516d8 100644 --- a/harbour/src/lang/msgsliso.c +++ b/harbour/src/lang/msgsliso.c @@ -200,19 +200,5 @@ static HB_LANG s_lang = } }; -HB_LANG_ANNOUNCE( SLISO ) - -HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_SLISO ) - hb_langRegister( &s_lang ); -HB_CALL_ON_STARTUP_END( hb_lang_Init_SLISO ) - -#if defined( HB_PRAGMA_STARTUP ) - #pragma startup hb_lang_Init_SLISO -#elif defined( HB_MSC_STARTUP ) - #if defined( HB_OS_WIN_64 ) - #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif - #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_hb_lang_Init_SLISO = hb_lang_Init_SLISO; - #pragma data_seg() -#endif +#define HB_LANG_ID SLISO +#include "hbmsgreg.h" diff --git a/harbour/src/lang/msgslwin.c b/harbour/src/lang/msgslwin.c index 11fa95339c..ad9b55e516 100644 --- a/harbour/src/lang/msgslwin.c +++ b/harbour/src/lang/msgslwin.c @@ -200,19 +200,5 @@ static HB_LANG s_lang = } }; -HB_LANG_ANNOUNCE( SLWIN ) - -HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_SLWIN ) - hb_langRegister( &s_lang ); -HB_CALL_ON_STARTUP_END( hb_lang_Init_SLWIN ) - -#if defined( HB_PRAGMA_STARTUP ) - #pragma startup hb_lang_Init_SLWIN -#elif defined( HB_MSC_STARTUP ) - #if defined( HB_OS_WIN_64 ) - #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif - #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_hb_lang_Init_SLWIN = hb_lang_Init_SLWIN; - #pragma data_seg() -#endif +#define HB_LANG_ID SLWIN +#include "hbmsgreg.h" diff --git a/harbour/src/lang/msgsr852.c b/harbour/src/lang/msgsr852.c index 3dd4d4e6d0..eca169f1cd 100644 --- a/harbour/src/lang/msgsr852.c +++ b/harbour/src/lang/msgsr852.c @@ -200,19 +200,5 @@ static HB_LANG s_lang = } }; -HB_LANG_ANNOUNCE( SR852 ) - -HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_SR852 ) - hb_langRegister( &s_lang ); -HB_CALL_ON_STARTUP_END( hb_lang_Init_SR852 ) - -#if defined( HB_PRAGMA_STARTUP ) - #pragma startup hb_lang_Init_SR852 -#elif defined( HB_MSC_STARTUP ) - #if defined( HB_OS_WIN_64 ) - #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif - #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_hb_lang_Init_SR852 = hb_lang_Init_SR852; - #pragma data_seg() -#endif +#define HB_LANG_ID SR852 +#include "hbmsgreg.h" diff --git a/harbour/src/lang/msgsriso.c b/harbour/src/lang/msgsriso.c index 987e504096..68e0d3c62d 100644 --- a/harbour/src/lang/msgsriso.c +++ b/harbour/src/lang/msgsriso.c @@ -200,19 +200,5 @@ static HB_LANG s_lang = } }; -HB_LANG_ANNOUNCE( SRISO ) - -HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_SRISO ) - hb_langRegister( &s_lang ); -HB_CALL_ON_STARTUP_END( hb_lang_Init_SRISO ) - -#if defined( HB_PRAGMA_STARTUP ) - #pragma startup hb_lang_Init_SRISO -#elif defined( HB_MSC_STARTUP ) - #if defined( HB_OS_WIN_64 ) - #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif - #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_hb_lang_Init_SRISO = hb_lang_Init_SRISO; - #pragma data_seg() -#endif +#define HB_LANG_ID SRISO +#include "hbmsgreg.h" diff --git a/harbour/src/lang/msgsrwin.c b/harbour/src/lang/msgsrwin.c index cf3ac4823b..6ee8b4b4cf 100644 --- a/harbour/src/lang/msgsrwin.c +++ b/harbour/src/lang/msgsrwin.c @@ -200,19 +200,5 @@ static HB_LANG s_lang = } }; -HB_LANG_ANNOUNCE( SRWIN ) - -HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_SRWIN ) - hb_langRegister( &s_lang ); -HB_CALL_ON_STARTUP_END( hb_lang_Init_SRWIN ) - -#if defined( HB_PRAGMA_STARTUP ) - #pragma startup hb_lang_Init_SRWIN -#elif defined( HB_MSC_STARTUP ) - #if defined( HB_OS_WIN_64 ) - #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif - #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_hb_lang_Init_SRWIN = hb_lang_Init_SRWIN; - #pragma data_seg() -#endif +#define HB_LANG_ID SRWIN +#include "hbmsgreg.h" diff --git a/harbour/src/lang/msgtr857.c b/harbour/src/lang/msgtr857.c index c48d0a77ce..176de4871d 100644 --- a/harbour/src/lang/msgtr857.c +++ b/harbour/src/lang/msgtr857.c @@ -200,19 +200,5 @@ static HB_LANG s_lang = } }; -HB_LANG_ANNOUNCE( TR857 ) - -HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_TR857 ) - hb_langRegister( &s_lang ); -HB_CALL_ON_STARTUP_END( hb_lang_Init_TR857 ) - -#if defined( HB_PRAGMA_STARTUP ) - #pragma startup hb_lang_Init_TR857 -#elif defined( HB_MSC_STARTUP ) - #if defined( HB_OS_WIN_64 ) - #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif - #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_hb_lang_Init_TR857 = hb_lang_Init_TR857; - #pragma data_seg() -#endif +#define HB_LANG_ID TR857 +#include "hbmsgreg.h" diff --git a/harbour/src/lang/msgtrwin.c b/harbour/src/lang/msgtrwin.c index a4dd34a675..e4f5a8075b 100644 --- a/harbour/src/lang/msgtrwin.c +++ b/harbour/src/lang/msgtrwin.c @@ -200,19 +200,5 @@ static HB_LANG s_lang = } }; -HB_LANG_ANNOUNCE( TRWIN ) - -HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_TRWIN ) - hb_langRegister( &s_lang ); -HB_CALL_ON_STARTUP_END( hb_lang_Init_TRWIN ) - -#if defined( HB_PRAGMA_STARTUP ) - #pragma startup hb_lang_Init_TRWIN -#elif defined( HB_MSC_STARTUP ) - #if defined( HB_OS_WIN_64 ) - #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif - #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_hb_lang_Init_TRWIN = hb_lang_Init_TRWIN; - #pragma data_seg() -#endif +#define HB_LANG_ID TRWIN +#include "hbmsgreg.h" diff --git a/harbour/src/lang/msgua866.c b/harbour/src/lang/msgua866.c index 982fe2de17..a5e4dcba2d 100644 --- a/harbour/src/lang/msgua866.c +++ b/harbour/src/lang/msgua866.c @@ -200,19 +200,5 @@ static HB_LANG s_lang = } }; -HB_LANG_ANNOUNCE( UA866 ) - -HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_UA866 ) - hb_langRegister( &s_lang ); -HB_CALL_ON_STARTUP_END( hb_lang_Init_UA866 ) - -#if defined( HB_PRAGMA_STARTUP ) - #pragma startup hb_lang_Init_UA866 -#elif defined( HB_MSC_STARTUP ) - #if defined( HB_OS_WIN_64 ) - #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif - #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_hb_lang_Init_UA866 = hb_lang_Init_UA866; - #pragma data_seg() -#endif +#define HB_LANG_ID UA866 +#include "hbmsgreg.h" diff --git a/harbour/src/lang/msguados.c b/harbour/src/lang/msguados.c index 60abf49c7d..3c467f6a46 100644 --- a/harbour/src/lang/msguados.c +++ b/harbour/src/lang/msguados.c @@ -200,19 +200,5 @@ static HB_LANG s_lang = } }; -HB_LANG_ANNOUNCE( UADOS ) - -HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_UADOS ) - hb_langRegister( &s_lang ); -HB_CALL_ON_STARTUP_END( hb_lang_Init_UADOS ) - -#if defined( HB_PRAGMA_STARTUP ) - #pragma startup hb_lang_Init_UADOS -#elif defined( HB_MSC_STARTUP ) - #if defined( HB_OS_WIN_64 ) - #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif - #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_hb_lang_Init_UADOS = hb_lang_Init_UADOS; - #pragma data_seg() -#endif +#define HB_LANG_ID UADOS +#include "hbmsgreg.h" diff --git a/harbour/src/lang/msguakoi.c b/harbour/src/lang/msguakoi.c index 0ea8638cd3..8e084f3527 100644 --- a/harbour/src/lang/msguakoi.c +++ b/harbour/src/lang/msguakoi.c @@ -200,19 +200,5 @@ static HB_LANG s_lang = } }; -HB_LANG_ANNOUNCE( UAKOI8 ) - -HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_UAKOI8 ) - hb_langRegister( &s_lang ); -HB_CALL_ON_STARTUP_END( hb_lang_Init_UAKOI8 ) - -#if defined( HB_PRAGMA_STARTUP ) - #pragma startup hb_lang_Init_UAKOI8 -#elif defined( HB_MSC_STARTUP ) - #if defined( HB_OS_WIN_64 ) - #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif - #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_hb_lang_Init_UAKOI8 = hb_lang_Init_UAKOI8; - #pragma data_seg() -#endif +#define HB_LANG_ID UAKOI8 +#include "hbmsgreg.h" diff --git a/harbour/src/lang/msguawin.c b/harbour/src/lang/msguawin.c index cc0b280cd7..bce6b822c0 100644 --- a/harbour/src/lang/msguawin.c +++ b/harbour/src/lang/msguawin.c @@ -200,19 +200,5 @@ static HB_LANG s_lang = } }; -HB_LANG_ANNOUNCE( UAWIN ) - -HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_UAWIN ) - hb_langRegister( &s_lang ); -HB_CALL_ON_STARTUP_END( hb_lang_Init_UAWIN ) - -#if defined( HB_PRAGMA_STARTUP ) - #pragma startup hb_lang_Init_UAWIN -#elif defined( HB_MSC_STARTUP ) - #if defined( HB_OS_WIN_64 ) - #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif - #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_hb_lang_Init_UAWIN = hb_lang_Init_UAWIN; - #pragma data_seg() -#endif +#define HB_LANG_ID UAWIN +#include "hbmsgreg.h" diff --git a/harbour/src/lang/msgzhb5.c b/harbour/src/lang/msgzhb5.c index 54225b4443..5a359be429 100644 --- a/harbour/src/lang/msgzhb5.c +++ b/harbour/src/lang/msgzhb5.c @@ -201,19 +201,5 @@ static HB_LANG s_lang = } }; -HB_LANG_ANNOUNCE( ZHB5 ) - -HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_ZHB5 ) - hb_langRegister( &s_lang ); -HB_CALL_ON_STARTUP_END( hb_lang_Init_ZHB5 ) - -#if defined( HB_PRAGMA_STARTUP ) - #pragma startup hb_lang_Init_ZHB5 -#elif defined( HB_MSC_STARTUP ) - #if defined( HB_OS_WIN_64 ) - #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif - #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_hb_lang_Init_ZHB5 = hb_lang_Init_ZHB5; - #pragma data_seg() -#endif +#define HB_LANG_ID ZHB5 +#include "hbmsgreg.h" diff --git a/harbour/src/lang/msgzhgb.c b/harbour/src/lang/msgzhgb.c index 203df65107..5ed9a19a41 100644 --- a/harbour/src/lang/msgzhgb.c +++ b/harbour/src/lang/msgzhgb.c @@ -201,19 +201,5 @@ static HB_LANG s_lang = } }; -HB_LANG_ANNOUNCE( ZHGB ) - -HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_ZHGB ) - hb_langRegister( &s_lang ); -HB_CALL_ON_STARTUP_END( hb_lang_Init_ZHGB ) - -#if defined( HB_PRAGMA_STARTUP ) - #pragma startup hb_lang_Init_ZHGB -#elif defined( HB_MSC_STARTUP ) - #if defined( HB_OS_WIN_64 ) - #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif - #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_hb_lang_Init_ZHGB = hb_lang_Init_ZHGB; - #pragma data_seg() -#endif +#define HB_LANG_ID ZHGB +#include "hbmsgreg.h" diff --git a/harbour/src/pp/pplib3.c b/harbour/src/pp/pplib3.c index c611fafdd0..3b594d466c 100644 --- a/harbour/src/pp/pplib3.c +++ b/harbour/src/pp/pplib3.c @@ -69,13 +69,9 @@ HB_INIT_SYMBOLS_EX_END( hb_vm_SymbolInit_PPLIB3, "pplib3.c", 0, 0 ) #if defined( HB_PRAGMA_STARTUP ) #pragma startup hb_vm_SymbolInit_PPLIB3 -#elif defined( HB_MSC_STARTUP ) - #if defined( HB_OS_WIN_64 ) - #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif - #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_SymbolInit_PPLIB3 = hb_vm_SymbolInit_PPLIB3; - #pragma data_seg() +#elif defined( HB_DATASEG_STARTUP ) + #define HB_DATASEG_BODY HB_DATASEG_FUNC( hb_vm_SymbolInit_PPLIB3 ) + #include "hbiniseg.h" #endif diff --git a/harbour/src/rdd/dbf1.c b/harbour/src/rdd/dbf1.c index bfd3a815d2..0c3c81e7a5 100644 --- a/harbour/src/rdd/dbf1.c +++ b/harbour/src/rdd/dbf1.c @@ -5980,12 +5980,8 @@ HB_CALL_ON_STARTUP_END( _hb_dbf_rdd_init_ ) #if defined( HB_PRAGMA_STARTUP ) #pragma startup dbf1__InitSymbols #pragma startup _hb_dbf_rdd_init_ -#elif defined( HB_MSC_STARTUP ) - #if defined( HB_OS_WIN_64 ) - #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif - #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_dbf1__InitSymbols = dbf1__InitSymbols; - static HB_$INITSYM hb_vm_auto_dbf_rdd_init = _hb_dbf_rdd_init_; - #pragma data_seg() +#elif defined( HB_DATASEG_STARTUP ) + #define HB_DATASEG_BODY HB_DATASEG_FUNC( dbf1__InitSymbols ) \ + HB_DATASEG_FUNC( _hb_dbf_rdd_init_ ) + #include "hbiniseg.h" #endif diff --git a/harbour/src/rdd/dbfcdx/dbfcdx1.c b/harbour/src/rdd/dbfcdx/dbfcdx1.c index 15f75b7cb9..81849d5a53 100644 --- a/harbour/src/rdd/dbfcdx/dbfcdx1.c +++ b/harbour/src/rdd/dbfcdx/dbfcdx1.c @@ -9827,14 +9827,10 @@ HB_CALL_ON_STARTUP_END( _hb_sixcdx_rdd_init_ ) #if defined( HB_PRAGMA_STARTUP ) #pragma startup sixcdx1__InitSymbols #pragma startup _hb_sixcdx_rdd_init_ -#elif defined( HB_MSC_STARTUP ) - #if defined( HB_OS_WIN_64 ) - #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif - #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_sixcdx1__InitSymbols = sixcdx1__InitSymbols; - static HB_$INITSYM hb_vm_auto_sixcdx_rdd_init = _hb_sixcdx_rdd_init_; - #pragma data_seg() +#elif defined( HB_DATASEG_STARTUP ) + #define HB_DATASEG_BODY HB_DATASEG_FUNC( sixcdx1__InitSymbols ) \ + HB_DATASEG_FUNC( _hb_sixcdx_rdd_init_ ) + #include "hbiniseg.h" #endif #else @@ -9906,14 +9902,10 @@ HB_CALL_ON_STARTUP_END( _hb_dbfcdx_rdd_init_ ) #if defined( HB_PRAGMA_STARTUP ) #pragma startup dbfcdx1__InitSymbols #pragma startup _hb_dbfcdx_rdd_init_ -#elif defined( HB_MSC_STARTUP ) - #if defined( HB_OS_WIN_64 ) - #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif - #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_dbfcdx1__InitSymbols = dbfcdx1__InitSymbols; - static HB_$INITSYM hb_vm_auto_dbfcdx_rdd_init = _hb_dbfcdx_rdd_init_; - #pragma data_seg() +#elif defined( HB_DATASEG_STARTUP ) + #define HB_DATASEG_BODY HB_DATASEG_FUNC( dbfcdx1__InitSymbols ) \ + HB_DATASEG_FUNC( _hb_dbfcdx_rdd_init_ ) + #include "hbiniseg.h" #endif #endif diff --git a/harbour/src/rdd/dbffpt/dbffpt1.c b/harbour/src/rdd/dbffpt/dbffpt1.c index c54af87542..e9553836e2 100644 --- a/harbour/src/rdd/dbffpt/dbffpt1.c +++ b/harbour/src/rdd/dbffpt/dbffpt1.c @@ -5304,12 +5304,8 @@ HB_CALL_ON_STARTUP_END( _hb_dbffpt_rdd_init_ ) #if defined( HB_PRAGMA_STARTUP ) #pragma startup dbffpt1__InitSymbols #pragma startup _hb_dbffpt_rdd_init_ -#elif defined( HB_MSC_STARTUP ) - #if defined( HB_OS_WIN_64 ) - #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif - #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_dbffpt1__InitSymbols = dbffpt1__InitSymbols; - static HB_$INITSYM hb_vm_auto_dbffpt_rdd_init = _hb_dbffpt_rdd_init_; - #pragma data_seg() +#elif defined( HB_DATASEG_STARTUP ) + #define HB_DATASEG_BODY HB_DATASEG_FUNC( dbffpt1__InitSymbols ) \ + HB_DATASEG_FUNC( _hb_dbffpt_rdd_init_ ) + #include "hbiniseg.h" #endif diff --git a/harbour/src/rdd/dbfnsx/dbfnsx1.c b/harbour/src/rdd/dbfnsx/dbfnsx1.c index 0b22bc0e0c..89fa3ae16d 100644 --- a/harbour/src/rdd/dbfnsx/dbfnsx1.c +++ b/harbour/src/rdd/dbfnsx/dbfnsx1.c @@ -8204,12 +8204,8 @@ HB_CALL_ON_STARTUP_END( _hb_dbfnsx_rdd_init_ ) #if defined( HB_PRAGMA_STARTUP ) # pragma startup dbfnsx1__InitSymbols # pragma startup _hb_dbfnsx_rdd_init_ -#elif defined( HB_MSC_STARTUP ) -# if defined( HB_OS_WIN_64 ) -# pragma section( HB_MSC_START_SEGMENT, long, read ) -# endif -# pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_dbfnsx1__InitSymbols = dbfnsx1__InitSymbols; - static HB_$INITSYM hb_vm_auto_dbfnsx_rdd_init = _hb_dbfnsx_rdd_init_; -# pragma data_seg() +#elif defined( HB_DATASEG_STARTUP ) + #define HB_DATASEG_BODY HB_DATASEG_FUNC( dbfnsx1__InitSymbols ) \ + HB_DATASEG_FUNC( _hb_dbfnsx_rdd_init_ ) + #include "hbiniseg.h" #endif diff --git a/harbour/src/rdd/dbfntx/dbfntx1.c b/harbour/src/rdd/dbfntx/dbfntx1.c index 91bd99dde0..56ce4e2b30 100644 --- a/harbour/src/rdd/dbfntx/dbfntx1.c +++ b/harbour/src/rdd/dbfntx/dbfntx1.c @@ -7903,12 +7903,8 @@ HB_CALL_ON_STARTUP_END( _hb_dbfntx_rdd_init_ ) #if defined( HB_PRAGMA_STARTUP ) #pragma startup dbfntx1__InitSymbols #pragma startup _hb_dbfntx_rdd_init_ -#elif defined( HB_MSC_STARTUP ) - #if defined( HB_OS_WIN_64 ) - #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif - #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_dbfntx1__InitSymbols = dbfntx1__InitSymbols; - static HB_$INITSYM hb_vm_auto_dbfntx_rdd_init = _hb_dbfntx_rdd_init_; - #pragma data_seg() +#elif defined( HB_DATASEG_STARTUP ) + #define HB_DATASEG_BODY HB_DATASEG_FUNC( dbfntx1__InitSymbols ) \ + HB_DATASEG_FUNC( _hb_dbfntx_rdd_init_ ) + #include "hbiniseg.h" #endif diff --git a/harbour/src/rdd/delim1.c b/harbour/src/rdd/delim1.c index fe5639baa4..8df50575d4 100644 --- a/harbour/src/rdd/delim1.c +++ b/harbour/src/rdd/delim1.c @@ -1608,12 +1608,8 @@ HB_CALL_ON_STARTUP_END( _hb_delim_rdd_init_ ) #if defined( HB_PRAGMA_STARTUP ) #pragma startup delim1__InitSymbols #pragma startup _hb_delim_rdd_init_ -#elif defined( HB_MSC_STARTUP ) - #if defined( HB_OS_WIN_64 ) - #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif - #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_delim1__InitSymbols = delim1__InitSymbols; - static HB_$INITSYM hb_vm_auto_delim_rdd_init = _hb_delim_rdd_init_; - #pragma data_seg() +#elif defined( HB_DATASEG_STARTUP ) + #define HB_DATASEG_BODY HB_DATASEG_FUNC( delim1__InitSymbols ) \ + HB_DATASEG_FUNC( _hb_delim_rdd_init_ ) + #include "hbiniseg.h" #endif diff --git a/harbour/src/rdd/sdf1.c b/harbour/src/rdd/sdf1.c index 14a5cb7b83..62cd147fcc 100644 --- a/harbour/src/rdd/sdf1.c +++ b/harbour/src/rdd/sdf1.c @@ -1343,12 +1343,8 @@ HB_CALL_ON_STARTUP_END( _hb_sdf_rdd_init_ ) #if defined( HB_PRAGMA_STARTUP ) #pragma startup sdf1__InitSymbols #pragma startup _hb_sdf_rdd_init_ -#elif defined( HB_MSC_STARTUP ) - #if defined( HB_OS_WIN_64 ) - #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif - #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_sdf1__InitSymbols = sdf1__InitSymbols; - static HB_$INITSYM hb_vm_auto_sdf_rdd_init = _hb_sdf_rdd_init_; - #pragma data_seg() +#elif defined( HB_DATASEG_STARTUP ) + #define HB_DATASEG_BODY HB_DATASEG_FUNC( sdf1__InitSymbols ) \ + HB_DATASEG_FUNC( _hb_sdf_rdd_init_ ) + #include "hbiniseg.h" #endif diff --git a/harbour/src/rtl/filesys.c b/harbour/src/rtl/filesys.c index aaf2965a83..fc3cae9620 100644 --- a/harbour/src/rtl/filesys.c +++ b/harbour/src/rtl/filesys.c @@ -1166,26 +1166,27 @@ BOOL hb_fsSetFileTime( const char * pszFileName, long lJulian, long lMillisec ) DosGetDateTime( &dt ); - fdate.year = dt.year - 1980; - fdate.month = dt.month; - fdate.day = dt.day; - ftime.hours = dt.hours; - ftime.minutes = dt.minutes; - ftime.twosecs = dt.seconds / 2; - } - if( lJulian > 0 ) - { - fdate.year = iYear - 1980; - fdate.month = iMonth; - fdate.day = iDay; - } - if( lMillisec >= 0 ) - { - ftime.hours = iHour; - ftime.minutes = iMinute; - ftime.twosecs = iSecond / 2; + if( lJulian <= 0 ) + { + iYear = dt.year; + iMonth = dt.month; + iDay = dt.day; + } + if( lMillisec < 0 ) + { + iHour = dt.hours; + iMinute = dt.minutes; + iSecond = dt.seconds; + } } + fdate.year = iYear - 1980; + fdate.month = iMonth; + fdate.day = iDay; + ftime.hours = iHour; + ftime.minutes = iMinute; + ftime.twosecs = iSecond / 2; + fs3.fdateCreation = fs3.fdateLastAccess = fs3.fdateLastWrite = fdate; fs3.ftimeCreation = fs3.ftimeLastAccess = fs3.ftimeLastWrite = ftime; ulrc = DosSetPathInfo( ( PCSZ ) pszFileName, FIL_STANDARD, diff --git a/harbour/src/rtl/hbregex.c b/harbour/src/rtl/hbregex.c index 2d43da80b6..57948d4fb4 100644 --- a/harbour/src/rtl/hbregex.c +++ b/harbour/src/rtl/hbregex.c @@ -563,11 +563,7 @@ HB_CALL_ON_STARTUP_END( _hb_regex_init_ ) #if defined( HB_PRAGMA_STARTUP ) #pragma startup _hb_regex_init_ -#elif defined( HB_MSC_STARTUP ) - #if defined( HB_OS_WIN_64 ) - #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif - #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_regex_init_ = _hb_regex_init_; - #pragma data_seg() +#elif defined( HB_DATASEG_STARTUP ) + #define HB_DATASEG_BODY HB_DATASEG_FUNC( _hb_regex_init_ ) + #include "hbiniseg.h" #endif diff --git a/harbour/src/rtl/hbzlibgz.c b/harbour/src/rtl/hbzlibgz.c index 1151c15c19..dc36c7c974 100644 --- a/harbour/src/rtl/hbzlibgz.c +++ b/harbour/src/rtl/hbzlibgz.c @@ -59,11 +59,11 @@ /* GZIP stream destructor */ static HB_GARBAGE_FUNC( hb_gz_Destructor ) { - gzFile * gz = ( gzFile * ) Cargo; - if( * gz ) + gzFile * gzHolder = ( gzFile * ) Cargo; + if( * gzHolder ) { - gzclose( * gz ); - * gz = NULL; + gzclose( * gzHolder ); + * gzHolder = NULL; } } @@ -85,7 +85,7 @@ static gzFile hb_gzParam( int iParam ) } /* - * HB_GZOPEN( , ) => or NIL on Error + * HB_GZOPEN( , ) => or NIL on Error */ HB_FUNC( HB_GZOPEN ) { @@ -106,7 +106,7 @@ HB_FUNC( HB_GZOPEN ) } /* - * HB_GZDOPEN( , ) => or NIL on Error + * HB_GZDOPEN( , ) => or NIL on Error */ HB_FUNC( HB_GZDOPEN ) { diff --git a/harbour/src/vm/fm.c b/harbour/src/vm/fm.c index e80430306f..4813f3c6ec 100644 --- a/harbour/src/vm/fm.c +++ b/harbour/src/vm/fm.c @@ -171,6 +171,7 @@ # pragma warning 367 9 # pragma warning 368 9 # pragma warning 887 9 +# pragma disable_message ( 201 ) # if !defined( USE_DL_PREFIX ) && !defined( HB_FM_DLMT_ALLOC ) # define USE_DL_PREFIX # endif @@ -198,6 +199,8 @@ # pragma warning 367 2 # pragma warning 368 2 # pragma warning 887 2 +# pragma warning 887 2 +# pragma enable_message ( 201 ) # endif # if defined( HB_FM_DLMT_ALLOC ) # define malloc( n ) mspace_malloc( hb_mspace(), ( n ) ) diff --git a/harbour/src/vm/task.c b/harbour/src/vm/task.c index 0f137c667a..8733bc40e9 100644 --- a/harbour/src/vm/task.c +++ b/harbour/src/vm/task.c @@ -209,21 +209,23 @@ static HB_LONG hb_taskTimeStop( unsigned long ulMilliSec ) { if( ulMilliSec == HB_TASK_INFINITE_WAIT ) return HB_TASK_INFINITE_DELAY; - + else + { #if defined( __DJGPP__ ) - /* uclock_t uclock() * 1000 / UCLOCKS_PER_SEC */ - return ( HB_LONG ) clock() * 1000 / CLOCKS_PER_SEC + ulMilliSec; + /* uclock_t uclock() * 1000 / UCLOCKS_PER_SEC */ + return ( HB_LONG ) clock() * 1000 / CLOCKS_PER_SEC + ulMilliSec; #elif _POSIX_C_SOURCE >= 199309L - struct timespec ts; - clock_gettime( CLOCK_REALTIME, &ts ); - return ( HB_LONG ) ts.tv_sec * 1000 + ts.tv_nsec / 1000000 + ulMilliSec; + struct timespec ts; + clock_gettime( CLOCK_REALTIME, &ts ); + return ( HB_LONG ) ts.tv_sec * 1000 + ts.tv_nsec / 1000000 + ulMilliSec; #elif defined( HB_OS_UNIX ) - struct timeval tv; - gettimeofday( &tv, NULL ); - return ( HB_LONG ) tv.tv_sec * 1000 + tv.tv_usec / 1000 + ulMilliSec; + struct timeval tv; + gettimeofday( &tv, NULL ); + return ( HB_LONG ) tv.tv_sec * 1000 + tv.tv_usec / 1000 + ulMilliSec; #else - return ( HB_LONG ) clock() * 1000 / CLOCKS_PER_SEC + ulMilliSec; + return ( HB_LONG ) clock() * 1000 / CLOCKS_PER_SEC + ulMilliSec; #endif + } } static void hb_taskFreeze( HB_LONG wakeup ) diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index 1ee2ad6ce4..20a2967e7d 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -3731,13 +3731,9 @@ FUNCTION hbmk( aArgs, /* @ */ lPause ) '' + Chr( 10 ) +; '#if defined( HB_PRAGMA_STARTUP )' + Chr( 10 ) +; ' #pragma startup _hb_hbmk_setdef_' + Chr( 10 ) +; - '#elif defined( HB_MSC_STARTUP )' + Chr( 10 ) +; - ' #if defined( HB_OS_WIN_64 )' + Chr( 10 ) +; - ' #pragma section( HB_MSC_START_SEGMENT, long, read )' + Chr( 10 ) +; - ' #endif' + Chr( 10 ) +; - ' #pragma data_seg( HB_MSC_START_SEGMENT )' + Chr( 10 ) +; - ' static HB_$INITSYM hb_vm_auto_hbmk_setdef_ = _hb_hbmk_setdef_;' + Chr( 10 ) +; - ' #pragma data_seg()' + Chr( 10 ) +; + '#elif defined( HB_DATASEG_STARTUP )' + Chr( 10 ) +; + ' #define HB_DATASEG_BODY HB_DATASEG_FUNC( _hb_hbmk_setdef_ )' + Chr( 10 ) +; + ' #include "hbiniseg.h"' + Chr( 10 ) +; '#endif' + Chr( 10 ) ENDIF