diff --git a/harbour/ChangeLog.txt b/harbour/ChangeLog.txt index a8a711451c..81a9c85dd9 100644 --- a/harbour/ChangeLog.txt +++ b/harbour/ChangeLog.txt @@ -10,6 +10,37 @@ * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment */ +2012-12-16 00:17 UTC+0100 Viktor Szakats (harbour syenar.net) + * include/hbcomp.h + * include/hbcompdf.h + * src/compiler/genc.c + * src/compiler/hbmain.c + * src/compiler/ppcomp.c + * renamed a non-prefixed Harbour type due to collision + with bcc64 (as per xhb commit) + ; TODO: Here is portion from my TODO backlog with a list of + other remaining non-prefixed types to fix: + FS_* -> HB_FS_* + FC_* -> HB_FC_* + FO_* -> HB_FO_* + FD_* -> HB_FD_* + F_ERROR -> (-) + VS_* -> HB_VSCOMP_* + VU_* -> HB_VU_* + VT_* -> HB_VT_* + FUN_* -> HB_FUN_* + *COMDECLARED -> [P]HB_HDECLARED + *COMCLASS -> [P]HB_HCLASS + *COMSYMBOL -> [P]HB_HSYMBOL + VAR, PVAR -> [P]HB_HVAR + _FUNC, PFUNCTION -> [P]HB_HFUNC + _FUNCALL, PFUNCALL -> [P]HB_HFUNCALL + _EXTERN, PEXTERN -> [P]HB_HEXTERN + AUTOOPEN, PAUTOOPEN -> [P]HB_HAUTOOPEN + FUNCTIONS -> HB_HFUNCTION_LIST + INLINES -> HB_HINLINE_LIST + SYMBOLS -> HB_HSYMBOL_LIST + 2012-12-16 00:06 UTC+0100 Viktor Szakats (harbour syenar.net) * contrib/3rd/sqlite3/sqlite3.hbp * contrib/3rd/sqlite3/* diff --git a/harbour/include/hbcomp.h b/harbour/include/hbcomp.h index c81b9e8a56..7f43994320 100644 --- a/harbour/include/hbcomp.h +++ b/harbour/include/hbcomp.h @@ -139,7 +139,7 @@ extern int hb_compVariableScope( HB_COMP_DECL, const char * ); #define FUN_ATTACHED 0x0200 /* function attached to function list */ extern void hb_compFunctionAdd( HB_COMP_DECL, const char * szFunName, HB_SYMBOLSCOPE cScope, int iType ); /* starts a new Clipper language function definition */ -extern PINLINE hb_compInlineAdd( HB_COMP_DECL, const char * szFunName, int iLine ); +extern PHB_HINLINE hb_compInlineAdd( HB_COMP_DECL, const char * szFunName, int iLine ); extern void hb_compFunctionMarkStatic( HB_COMP_DECL, const char * szFunName ); extern HB_EXPORT_INT const char * hb_compGetFuncID( const char * szFuncName, HB_FUNC_ID * pFunID, int * piFlags ); extern HB_BOOL hb_compFunCallCheck( HB_COMP_DECL, const char *, int ); diff --git a/harbour/include/hbcompdf.h b/harbour/include/hbcompdf.h index 25a5eb1be7..3fc0ea6cde 100644 --- a/harbour/include/hbcompdf.h +++ b/harbour/include/hbcompdf.h @@ -538,15 +538,15 @@ typedef struct __FUNC } _FUNC, * PFUNCTION; /* structure to hold an INLINE block of source */ -typedef struct __INLINE +typedef struct _HB_HINLINE { const char * szName; /* name of a inline function */ HB_BYTE * pCode; /* pointer to a memory block where pcode is stored */ HB_SIZE nPCodeSize; /* total memory size for pcode */ const char * szFileName; /* Source file name */ int iLine; /* Source line number */ - struct __INLINE * pNext; /* pointer to the next defined inline */ -} _INLINE, * PINLINE; + struct _HB_HINLINE * pNext; /* pointer to the next defined inline */ +} HB_HINLINE, * PHB_HINLINE; /* structure to hold a called functions */ typedef struct __FUNCALL @@ -567,9 +567,9 @@ typedef struct /* structure to control all Clipper defined functions */ typedef struct { - PINLINE pFirst; /* pointer to the first defined inline */ - PINLINE pLast; /* pointer to the last defined inline */ - int iCount; /* number of defined inlines */ + PHB_HINLINE pFirst; /* pointer to the first defined inline */ + PHB_HINLINE pLast; /* pointer to the last defined inline */ + int iCount; /* number of defined inlines */ } INLINES; /* compiler symbol support structure */ diff --git a/harbour/src/compiler/genc.c b/harbour/src/compiler/genc.c index f732b678f5..8e2ae4fe42 100644 --- a/harbour/src/compiler/genc.c +++ b/harbour/src/compiler/genc.c @@ -50,7 +50,7 @@ typedef HB_GENC_FUNC_ * HB_GENC_FUNC_PTR; static void hb_compDumpFindCFunc( HB_COMP_DECL ) { - PINLINE pInline; + PHB_HINLINE pInline; pInline = HB_COMP_PARAM->inlines.pFirst; while( pInline ) @@ -167,13 +167,13 @@ static void hb_compFuncUsed( HB_COMP_DECL, PCOMSYMBOL pSym ) void hb_compGenCCode( HB_COMP_DECL, PHB_FNAME pFileName ) /* generates the C language output */ { - char szFileName[ HB_PATH_MAX ]; - PCOMSYMBOL pSym; - PFUNCTION pFunc; - PINLINE pInline; - FILE * yyc; /* file handle for C output */ - HB_BOOL fHasHbInline = HB_FALSE; - int iFuncSuffix; + char szFileName[ HB_PATH_MAX ]; + PCOMSYMBOL pSym; + PFUNCTION pFunc; + PHB_HINLINE pInline; + FILE * yyc; /* file handle for C output */ + HB_BOOL fHasHbInline = HB_FALSE; + int iFuncSuffix; hb_fsFNameMerge( szFileName, pFileName ); if( ! pFileName->szExtension ) diff --git a/harbour/src/compiler/hbmain.c b/harbour/src/compiler/hbmain.c index 0e106f2e21..d013860dbe 100644 --- a/harbour/src/compiler/hbmain.c +++ b/harbour/src/compiler/hbmain.c @@ -1901,11 +1901,11 @@ static PFUNCTION hb_compFunctionNew( HB_COMP_DECL, const char * szName, HB_SYMBO return pFunc; } -static PINLINE hb_compInlineNew( HB_COMP_DECL, const char * szName, int iLine ) +static PHB_HINLINE hb_compInlineNew( HB_COMP_DECL, const char * szName, int iLine ) { - PINLINE pInline; + PHB_HINLINE pInline; - pInline = ( PINLINE ) hb_xgrab( sizeof( _INLINE ) ); + pInline = ( PHB_HINLINE ) hb_xgrab( sizeof( HB_HINLINE ) ); pInline->szName = szName; pInline->pCode = NULL; @@ -2265,9 +2265,9 @@ void hb_compFunctionMarkStatic( HB_COMP_DECL, const char * szFunName ) } } -PINLINE hb_compInlineAdd( HB_COMP_DECL, const char * szFunName, int iLine ) +PHB_HINLINE hb_compInlineAdd( HB_COMP_DECL, const char * szFunName, int iLine ) { - PINLINE pInline; + PHB_HINLINE pInline; PCOMSYMBOL pSym; if( szFunName ) @@ -3961,7 +3961,7 @@ void hb_compCompileEnd( HB_COMP_DECL ) while( HB_COMP_PARAM->inlines.pFirst ) { - PINLINE pInline = HB_COMP_PARAM->inlines.pFirst; + PHB_HINLINE pInline = HB_COMP_PARAM->inlines.pFirst; HB_COMP_PARAM->inlines.pFirst = pInline->pNext; if( pInline->pCode ) diff --git a/harbour/src/compiler/ppcomp.c b/harbour/src/compiler/ppcomp.c index a27dd6ffe9..fb7aa03ce4 100644 --- a/harbour/src/compiler/ppcomp.c +++ b/harbour/src/compiler/ppcomp.c @@ -83,7 +83,7 @@ static void hb_pp_Disp( void * cargo, const char * szMessage ) static void hb_pp_PragmaDump( void * cargo, char * pBuffer, HB_SIZE nSize, int iLine ) { - PINLINE pInline; + PHB_HINLINE pInline; pInline = hb_compInlineAdd( ( HB_COMP_PTR ) cargo, NULL, iLine ); pInline->pCode = ( HB_BYTE * ) hb_xgrab( nSize + 1 ); @@ -107,7 +107,7 @@ static void hb_pp_hb_inLine( void * cargo, char * szFunc, } else { - PINLINE pInline = hb_compInlineAdd( HB_COMP_PARAM, + PHB_HINLINE pInline = hb_compInlineAdd( HB_COMP_PARAM, hb_compIdentifierNew( HB_COMP_PARAM, szFunc, HB_IDENT_COPY ), iLine ); pInline->pCode = ( HB_BYTE * ) hb_xgrab( nSize + 1 ); memcpy( pInline->pCode, pBuffer, nSize );