From 851b8d63d2af42bdccc36831b1a6702d6d69251e Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sun, 10 Jun 2012 15:20:32 +0000 Subject: [PATCH] 2012-06-10 17:19 UTC+0200 Viktor Szakats (harbour syenar.net) * include/hbapi.h ! minor correction to compatibility macro definition --- harbour/ChangeLog | 4 ++++ harbour/include/hbapi.h | 12 ++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index bb99dcdf4e..97e308713c 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,10 @@ The license applies to all entries newer than 2009-04-28. */ +2012-06-10 17:19 UTC+0200 Viktor Szakats (harbour syenar.net) + * include/hbapi.h + ! minor correction to compatibility macro definition + 2012-06-10 16:43 UTC+0200 Viktor Szakats (harbour syenar.net) * contrib/hbziparc/ziparc.prg ! fixed using old IS*() macro w/o common.ch diff --git a/harbour/include/hbapi.h b/harbour/include/hbapi.h index ace13ea350..2cbb59fb17 100644 --- a/harbour/include/hbapi.h +++ b/harbour/include/hbapi.h @@ -449,12 +449,6 @@ typedef struct _HB_CODEBLOCK HB_SHORT dynBuffer; /* is pcode buffer allocated dynamically, SHORT used instead of HB_BOOL intentionally to force optimal alignment */ } HB_CODEBLOCK, * HB_CODEBLOCK_PTR; -#if defined( HB_LEGACY_LEVEL4 ) -# define HB_ITEM_PTR PHB_ITEM -# define HB_BASEARRAY_PTR PHB_BASEARRAY -# define PHB_CODEBLOCK HB_CODEBLOCK_PTR -#endif - typedef void ( * HB_EXTREF_FUNC0 )( void * ); typedef PHB_ITEM ( * HB_EXTREF_FUNC1 )( PHB_ITEM ); typedef PHB_ITEM ( * HB_EXTREF_FUNC2 )( PHB_ITEM, PHB_ITEM ); @@ -534,6 +528,12 @@ extern void * hb_xRefResize( void * pMem, HB_SIZE nSave, HB_SIZE nSize, HB_S #endif /* _HB_API_INTERNAL_ */ +#if defined( HB_LEGACY_LEVEL4 ) +# define HB_ITEM_PTR PHB_ITEM +# define HB_BASEARRAY_PTR PHB_BASEARRAY +# define PHB_CODEBLOCK HB_CODEBLOCK_PTR +#endif + #define hb_xgrabz( n ) memset( hb_xgrab( ( n ) ), 0, ( n ) ) #define hb_xmemdup( p, n ) memcpy( hb_xgrab( ( n ) ), ( p ), ( n ) )