From 6fb4bbcdde1cc74c8db22855739ce57c16b62c79 Mon Sep 17 00:00:00 2001 From: Przemyslaw Czerpak Date: Thu, 30 Aug 2012 13:31:05 +0000 Subject: [PATCH] 2012-08-30 15:30 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl) * harbour/include/hbinit.h * added HB_INIT_SYMBOLS_COUNT macro --- harbour/ChangeLog | 8 ++++++-- harbour/include/hbinit.h | 18 ++++++++++-------- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 73c504e8d7..c31e5ba6f2 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,10 @@ The license applies to all entries newer than 2009-04-28. */ +2012-08-30 15:30 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl) + * harbour/include/hbinit.h + * added HB_INIT_SYMBOLS_COUNT macro + 2012-08-29 19:38 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbqt/qtgui/hbqt_hbqplaintextedit.cpp * contrib/hbqt/qtgui/hbqt_hbqplaintextedit.h @@ -173,8 +177,8 @@ rtlnk_libtrans(), rtlnk_filetrans() Looks that this functionality is not longer supported. TOFIX: re-enable it or remove this code and document that automatic - translation for libraries and files defined in Clipper .lank - files is not longer supported~. + translation for libraries and files defined in Clipper .lnk + files is not longer supported. * harbour/src/rdd/usrrdd/rdds/arrayrdd.prg * harbour/contrib/hbtip/cgi.prg diff --git a/harbour/include/hbinit.h b/harbour/include/hbinit.h index 91e66ef354..a39b824c7f 100644 --- a/harbour/include/hbinit.h +++ b/harbour/include/hbinit.h @@ -68,6 +68,8 @@ extern HB_EXPORT PHB_SYMB hb_vmProcessSymbols( PHB_SYMB pSymbols, HB_USHORT uiSy #define HB_STATIC_STARTUP #endif +#define HB_INIT_SYMBOLS_COUNT ( sizeof( symbols_table ) / sizeof( HB_SYMB ) ) + #if defined( HB_STRICT_ANSI_C ) #define HB_INIT_SYMBOLS_BEGIN( func ) \ @@ -78,7 +80,7 @@ extern HB_EXPORT PHB_SYMB hb_vmProcessSymbols( PHB_SYMB pSymbols, HB_USHORT uiSy static PHB_SYMB symbols = symbols_table; \ void func( void ) \ { \ - symbols = hb_vmProcessSymbols( symbols_table, ( HB_USHORT ) ( sizeof( symbols_table ) / sizeof( HB_SYMB ) ), (module), (id), (vpcode) ); \ + symbols = hb_vmProcessSymbols( symbols_table, ( HB_USHORT ) HB_INIT_SYMBOLS_COUNT, (module), (id), (vpcode) ); \ } #define HB_CALL_ON_STARTUP_BEGIN( func ) \ @@ -99,7 +101,7 @@ extern HB_EXPORT PHB_SYMB hb_vmProcessSymbols( PHB_SYMB pSymbols, HB_USHORT uiSy #define HB_INIT_SYMBOLS_EX_END( func, module, id, vpcode ) \ }; \ - static PHB_SYMB symbols = hb_vmProcessSymbols( symbols_table, ( HB_USHORT ) ( sizeof( symbols_table ) / sizeof( HB_SYMB ) ), (module), (id), (vpcode) ); \ + static PHB_SYMB symbols = hb_vmProcessSymbols( symbols_table, ( HB_USHORT ) HB_INIT_SYMBOLS_COUNT, (module), (id), (vpcode) ); \ #define HB_CALL_ON_STARTUP_BEGIN( func ) \ static int func( void ) \ @@ -134,7 +136,7 @@ extern HB_EXPORT PHB_SYMB hb_vmProcessSymbols( PHB_SYMB pSymbols, HB_USHORT uiSy }; \ static PHB_SYMB symbols = symbols_table; \ HB_CALL_ON_STARTUP_BEGIN( func ) \ - symbols = hb_vmProcessSymbols( symbols_table, ( HB_USHORT ) ( sizeof( symbols_table ) / sizeof( HB_SYMB ) ), (module), (id), (vpcode) ); \ + symbols = hb_vmProcessSymbols( symbols_table, ( HB_USHORT ) HB_INIT_SYMBOLS_COUNT, (module), (id), (vpcode) ); \ HB_CALL_ON_STARTUP_END( func ) #define HB_CALL_ON_STARTUP_BEGIN( func ) \ @@ -178,7 +180,7 @@ extern HB_EXPORT PHB_SYMB hb_vmProcessSymbols( PHB_SYMB pSymbols, HB_USHORT uiSy static PHB_SYMB symbols = symbols_table; \ void __attribute__ ((constructor)) func( void ) \ { \ - symbols = hb_vmProcessSymbols( symbols_table, ( HB_USHORT ) ( sizeof( symbols_table ) / sizeof( HB_SYMB ) ), (module), (id), (vpcode) ); \ + symbols = hb_vmProcessSymbols( symbols_table, ( HB_USHORT ) HB_INIT_SYMBOLS_COUNT, (module), (id), (vpcode) ); \ } #define HB_CALL_ON_STARTUP_BEGIN( func ) \ @@ -190,7 +192,7 @@ extern HB_EXPORT PHB_SYMB hb_vmProcessSymbols( PHB_SYMB pSymbols, HB_USHORT uiSy static PHB_SYMB symbols = symbols_table; \ static void __attribute__ ((constructor)) func( void ) \ { \ - symbols = hb_vmProcessSymbols( symbols_table, ( HB_USHORT ) ( sizeof( symbols_table ) / sizeof( HB_SYMB ) ), (module), (id), (vpcode) ); \ + symbols = hb_vmProcessSymbols( symbols_table, ( HB_USHORT ) HB_INIT_SYMBOLS_COUNT, (module), (id), (vpcode) ); \ } #define HB_CALL_ON_STARTUP_BEGIN( func ) \ @@ -217,7 +219,7 @@ extern HB_EXPORT PHB_SYMB hb_vmProcessSymbols( PHB_SYMB pSymbols, HB_USHORT uiSy static PHB_SYMB symbols = symbols_table; \ static void func( void ) \ { \ - symbols = hb_vmProcessSymbols( symbols_table, ( HB_USHORT ) ( sizeof( symbols_table ) / sizeof( HB_SYMB ) ), (module), (id), (vpcode) ); \ + symbols = hb_vmProcessSymbols( symbols_table, ( HB_USHORT ) HB_INIT_SYMBOLS_COUNT, (module), (id), (vpcode) ); \ } #define HB_CALL_ON_STARTUP_BEGIN( func ) \ @@ -245,7 +247,7 @@ extern HB_EXPORT PHB_SYMB hb_vmProcessSymbols( PHB_SYMB pSymbols, HB_USHORT uiSy static PHB_SYMB symbols = symbols_table; \ static int func( void ) \ { \ - symbols = hb_vmProcessSymbols( symbols_table, ( HB_USHORT ) ( sizeof( symbols_table ) / sizeof( HB_SYMB ) ), (module), (id), (vpcode) ); \ + symbols = hb_vmProcessSymbols( symbols_table, ( HB_USHORT ) HB_INIT_SYMBOLS_COUNT, (module), (id), (vpcode) ); \ return 0; \ } @@ -281,7 +283,7 @@ extern HB_EXPORT PHB_SYMB hb_vmProcessSymbols( PHB_SYMB pSymbols, HB_USHORT uiSy static PHB_SYMB symbols = symbols_table; \ static void func( void ) \ { \ - symbols = hb_vmProcessSymbols( symbols_table, ( HB_USHORT ) ( sizeof( symbols_table ) / sizeof( HB_SYMB ) ), (module), (id), (vpcode) ); \ + symbols = hb_vmProcessSymbols( symbols_table, ( HB_USHORT ) HB_INIT_SYMBOLS_COUNT, (module), (id), (vpcode) ); \ } #define HB_CALL_ON_STARTUP_BEGIN( func ) \