diff --git a/harbour/ChangeLog b/harbour/ChangeLog index e659ea1e7d..70bc5ec520 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,19 +16,25 @@ The license applies to all entries newer than 2009-04-28. */ +2012-10-31 21:08 UTC+0100 Viktor Szakats (harbour syenar.net) + * contrib/gtalleg/gtalleg.c + + cleaned multiline macro to be more readable + and to be friendly with uncrustify. Now reformatting + won't change it. + 2012-10-31 20:57 UTC+0100 Viktor Szakats (harbour syenar.net) * contrib/gtalleg/*.[c|h] * contrib/hbamf/*.[c|h] * contrib/hbbz2/*.[c|h] * contrib/hbcairo/*.[c|h] - * uncrustified. pretty good results, without + * uncrustified. pretty good results, without any or very minimal manual touching up. * src/vm/classes.c * src/vm/dynsym.c * src/vm/garbage.c - * reverted patch targeting macros ending with ';' - where it could cause double ';' in final source + * reverted patch targeting macros ending with ';' + where it could cause double ';' in final source when the macro is defined to an empty value. * src/debug/dbgentry.c diff --git a/harbour/contrib/gtalleg/gtalleg.c b/harbour/contrib/gtalleg/gtalleg.c index 0fb5d63a66..1dd1e967cc 100644 --- a/harbour/contrib/gtalleg/gtalleg.c +++ b/harbour/contrib/gtalleg/gtalleg.c @@ -201,15 +201,21 @@ static const gtAllegKey s_CtrlTable[ GT_CTRL_TABLE_SIZE ] = { AL_KEY_PGDN, K_CTRL_PGDN } }; -#define GT_UPD_GFXRECT( t, l, b, r ) do { if( t < s_GFXUpd.iTop ) s_GFXUpd.iTop = t; \ - if( l < s_GFXUpd.iLeft ) s_GFXUpd.iLeft = l; \ - if( b > s_GFXUpd.iBottom ) s_GFXUpd.iBottom = b; \ - if( r > s_GFXUpd.iRight ) s_GFXUpd.iRight = r; \ - } while( 0 ) -#define GT_SCREENINIT() do { if( ! s_fInit ) \ - hb_gt_alleg_InitializeScreen( pGT, s_iScrHeight, s_iScrWidth, HB_TRUE ); \ - } while( 0 ) -#define MK_GT8BCOLOR( n ) ( ( n & 0xFF ) / 16 | ( n & 0xFF00 ) / 256 ) +#define GT_UPD_GFXRECT( t, l, b, r ) \ + do { \ + if( t < s_GFXUpd.iTop ) s_GFXUpd.iTop = t; \ + if( l < s_GFXUpd.iLeft ) s_GFXUpd.iLeft = l; \ + if( b > s_GFXUpd.iBottom ) s_GFXUpd.iBottom = b; \ + if( r > s_GFXUpd.iRight ) s_GFXUpd.iRight = r; \ + } while( 0 ) + +#define GT_SCREENINIT() \ + do { \ + if( ! s_fInit ) \ + hb_gt_alleg_InitializeScreen( pGT, s_iScrHeight, s_iScrWidth, HB_TRUE ); \ + } while( 0 ) + +#define MK_GT8BCOLOR( n ) ( ( n & 0xFF ) / 16 | ( n & 0xFF00 ) / 256 ) static void hb_gt_alleg_Error( const char * szMsg )