diff --git a/harbour/contrib/odbc/odbc.c b/harbour/contrib/odbc/odbc.c index 9fc21e11b0..ebf08b9dd9 100644 --- a/harbour/contrib/odbc/odbc.c +++ b/harbour/contrib/odbc/odbc.c @@ -70,7 +70,7 @@ HB_INIT_SYMBOLS_BEGIN( odbc__InitSymbols ) { "SQLEXECDIR", FS_PUBLIC, HB_SQLEXECDIR , 0 }, { "SQLFETCH", FS_PUBLIC, HB_SQLFETCH , 0 }, { "SQLGETDATA", FS_PUBLIC, HB_SQLGETDATA , 0 } -HB_INIT_SYMBOLS_END( odbc__InitSymbols ); +HB_INIT_SYMBOLS_END( odbc__InitSymbols ) #pragma odbc__InitSymbols HARBOUR HB_SQLALLOCEN( void ) /* HB_SQLALLOCENV( @hEnv ) --> nRetCode */ diff --git a/harbour/include/hb_vmpub.h b/harbour/include/hb_vmpub.h index d21703edf9..ed279c31a4 100644 --- a/harbour/include/hb_vmpub.h +++ b/harbour/include/hb_vmpub.h @@ -61,13 +61,13 @@ typedef struct _HB_DYNS } HB_DYNS, * PHB_DYNS, * HB_DYNS_PTR; /* Harbour Functions scope (SYMBOLSCOPE) */ -#define FS_PUBLIC 0x00 -#define FS_STATIC 0x02 -#define FS_INIT 0x08 -#define FS_EXIT 0x10 +#define FS_PUBLIC ((SYMBOLSCOPE)0x00) +#define FS_STATIC ((SYMBOLSCOPE)0x02) +#define FS_INIT ((SYMBOLSCOPE)0x08) +#define FS_EXIT ((SYMBOLSCOPE)0x10) #define FS_INITEXIT ( FS_INIT | FS_EXIT ) -#define FS_MESSAGE 0x20 -#define FS_MEMVAR 0x80 +#define FS_MESSAGE ((SYMBOLSCOPE)0x20) +#define FS_MEMVAR ((SYMBOLSCOPE)0x80) extern void hb_vmExecute( BYTE * pCode, PHB_SYMB pSymbols ); /* invokes the virtual machine */ diff --git a/harbour/include/init.h b/harbour/include/init.h index 595ee688f4..011a313901 100644 --- a/harbour/include/init.h +++ b/harbour/include/init.h @@ -91,13 +91,13 @@ extern void hb_vmProcessSymbols( PHB_SYMB pSymbols, WORD wSymbols ); /* statics hb_vmProcessSymbols( symbols, sizeof( symbols ) / sizeof( HB_SYMB ) ); \ return 1; \ }; \ - static int static_int_##func = func() + static int static_int_##func = func(); #define HB_CALL_ON_STARTUP_BEGIN( func ) \ static int func( void ) { #define HB_CALL_ON_STARTUP_END( func ) return 1; } \ - static int static_int_##func = func() + static int static_int_##func = func(); #endif #ifdef __WATCOMC__ @@ -110,15 +110,15 @@ extern void hb_vmProcessSymbols( PHB_SYMB pSymbols, WORD wSymbols ); /* statics hb_vmProcessSymbols( symbols, sizeof( symbols ) / sizeof( HB_SYMB ) ); \ return 1; \ }; \ - static int static_int_##func = func() + static int static_int_##func = func(); #define HB_CALL_ON_STARTUP_BEGIN( func ) \ static int func( void ) { #define HB_CALL_ON_STARTUP_END( func ) return 1; }; \ - static int static_int_##func = func() + static int static_int_##func = func(); #endif -#endif /*HARBOUR_STRICT_ANSI_C */ +#endif /* HARBOUR_STRICT_ANSI_C */ #endif /* HB_INIT_H_ */ diff --git a/harbour/include/rddapi.h b/harbour/include/rddapi.h index 0f734fbe1c..15abdd0de6 100644 --- a/harbour/include/rddapi.h +++ b/harbour/include/rddapi.h @@ -494,32 +494,36 @@ typedef struct _AREA struct _RDDFUNCS * lprfsHost; /* Virtual method table for this workarea */ USHORT uiArea; /* The number assigned to this workarea */ -// void * atomAlias; /* Pointer to the alias symbol for this workarea */ +#if 0 + void * atomAlias; /* Pointer to the alias symbol for this workarea */ +#endif USHORT uiFieldExtent; /* Total number of fields allocated */ USHORT uiFieldCount; /* Total number of fields used */ LPFIELD lpFields; /* Pointer to an array of fields */ -// void * lpFieldExtents; /* Void ptr for additional field properties */ +#if 0 + void * lpFieldExtents; /* Void ptr for additional field properties */ -// PHB_ITEM valResult; /* All purpose result holder */ + PHB_ITEM valResult; /* All purpose result holder */ -// BOOL fTop; /* TRUE if "top" */ -// BOOL fBottom; /* TRUE if "bottom" */ -// BOOL fBof; /* TRUE if "bof" */ -// BOOL fEof; /* TRUE if "eof" */ -// BOOL fFound; /* TRUE if "found" */ + BOOL fTop; /* TRUE if "top" */ + BOOL fBottom; /* TRUE if "bottom" */ + BOOL fBof; /* TRUE if "bof" */ + BOOL fEof; /* TRUE if "eof" */ + BOOL fFound; /* TRUE if "found" */ -// DBSCOPEINFO dbsi; /* Info regarding last LOCATE */ -// DBFILTERINFO dbfi; /* Filter in effect */ + DBSCOPEINFO dbsi; /* Info regarding last LOCATE */ + DBFILTERINFO dbfi; /* Filter in effect */ -// LPDBORDERCONDINFO lpdbOrdCondInfo; + LPDBORDERCONDINFO lpdbOrdCondInfo; -// LPDBRELINFO lpdbRelations; /* Parent/Child relationships used */ -// USHORT uiParents; /* Number of parents for this area */ + LPDBRELINFO lpdbRelations; /* Parent/Child relationships used */ + USHORT uiParents; /* Number of parents for this area */ -// HANDLE heap; -// USHORT heapSize; + HANDLE heap; + USHORT heapSize; +#endif USHORT rddID; @@ -572,42 +576,54 @@ typedef struct _RDDFUNCS DBENTRYP_BP found; DBENTRYP_V goBottom; DBENTRYP_L go; -// DBENTRYP_I goToId; +#if 0 + DBENTRYP_I goToId; +#endif DBENTRYP_V goTop; -// DBENTRYP_SI seek; +#if 0 + DBENTRYP_SI seek; +#endif DBENTRYP_L skip; -// DBENTRYP_L skipFilter; -// DBENTRYP_L skipRaw; +#if 0 + DBENTRYP_L skipFilter; + DBENTRYP_L skipRaw; +#endif /* Data management */ DBENTRYP_VF addField; -// DBENTRYP_S append; +#if 0 + DBENTRYP_S append; +#endif DBENTRYP_I createFields; -// DBENTRYP_V deleterec; -// DBENTRYP_SP deleted; -// DBENTRYP_SP fieldCount; -// DBENTRYP_VP fieldDisplay; -// DBENTRYP_SSI fieldInfo; -// DBENTRYP_SVP fieldName; -// DBENTRYP_V flush; -// DBENTRYP_PP getRec; -// DBENTRYP_SI getValue; -// DBENTRYP_SVP getVarLen; -// DBENTRYP_V goCold; -// DBENTRYP_V goHot; -// DBENTRYP_VP putRec; -// DBENTRYP_SI putValue; -// DBENTRYP_V recall; -// DBENTRYP_LP reccount; -// DBENTRYP_ISI recInfo; -// DBENTRYP_I recno; +#if 0 + DBENTRYP_V deleterec; + DBENTRYP_SP deleted; + DBENTRYP_SP fieldCount; + DBENTRYP_VP fieldDisplay; + DBENTRYP_SSI fieldInfo; + DBENTRYP_SVP fieldName; + DBENTRYP_V flush; + DBENTRYP_PP getRec; + DBENTRYP_SI getValue; + DBENTRYP_SVP getVarLen; + DBENTRYP_V goCold; + DBENTRYP_V goHot; + DBENTRYP_VP putRec; + DBENTRYP_SI putValue; + DBENTRYP_V recall; + DBENTRYP_LP reccount; + DBENTRYP_ISI recInfo; + DBENTRYP_I recno; +#endif DBENTRYP_S setFieldExtent; /* WorkArea/Database management */ -// DBENTRYP_VP alias; +#if 0 + DBENTRYP_VP alias; +#endif DBENTRYP_V close; DBENTRYP_VP create; DBENTRYP_SI info; @@ -616,87 +632,91 @@ typedef struct _RDDFUNCS DBENTRYP_V release; DBENTRYP_SP structSize; DBENTRYP_P sysName; -// DBENTRYP_VP dbEval; -// DBENTRYP_V pack; -// DBENTRYP_LSP packRec; -// DBENTRYP_VP sort; -// DBENTRYP_VP trans; -// DBENTRYP_VP transRec; -// DBENTRYP_V zap; +#if 0 + DBENTRYP_VP dbEval; + DBENTRYP_V pack; + DBENTRYP_LSP packRec; + DBENTRYP_VP sort; + DBENTRYP_VP trans; + DBENTRYP_VP transRec; + DBENTRYP_V zap; /* Relational Methods */ -// DBENTRYP_VP childEnd; -// DBENTRYP_VP childStart; -// DBENTRYP_VP childSync; -// DBENTRYP_V syncChildren; -// DBENTRYP_V clearRel; -// DBENTRYP_V forceRel; -// DBENTRYP_SVP relArea; -// DBENTRYP_VP relEval; -// DBENTRYP_SVP relText; -// DBENTRYP_VP setRel; + DBENTRYP_VP childEnd; + DBENTRYP_VP childStart; + DBENTRYP_VP childSync; + DBENTRYP_V syncChildren; + DBENTRYP_V clearRel; + DBENTRYP_V forceRel; + DBENTRYP_SVP relArea; + DBENTRYP_VP relEval; + DBENTRYP_SVP relText; + DBENTRYP_VP setRel; /* Order Management */ -// DBENTRYP_VP orderListAdd; -// DBENTRYP_V orderListClear; -// DBENTRYP_VP orderListDelete; -// DBENTRYP_VP orderListFocus; -// DBENTRYP_V orderListRebuild; + DBENTRYP_VP orderListAdd; + DBENTRYP_V orderListClear; + DBENTRYP_VP orderListDelete; + DBENTRYP_VP orderListFocus; + DBENTRYP_V orderListRebuild; -// DBENTRYP_VP orderCondition; -// DBENTRYP_VP orderCreate; -// DBENTRYP_VP orderDestroy; -// DBENTRYP_SVP orderInfo; + DBENTRYP_VP orderCondition; + DBENTRYP_VP orderCreate; + DBENTRYP_VP orderDestroy; + DBENTRYP_SVP orderInfo; /* Filters and Scope Settings */ -// DBENTRYP_V clearFilter; -// DBENTRYP_V clearLocate; -// DBENTRYP_V clearScope; -// DBENTRYP_VPLP countScope; -// DBENTRYP_VP filterText; -// DBENTRYP_SI scopeInfo; -// DBENTRYP_VP setFilter; -// DBENTRYP_VP setLocate; -// DBENTRYP_VP setScope; -// DBENTRYP_VPL skipScope; + DBENTRYP_V clearFilter; + DBENTRYP_V clearLocate; + DBENTRYP_V clearScope; + DBENTRYP_VPLP countScope; + DBENTRYP_VP filterText; + DBENTRYP_SI scopeInfo; + DBENTRYP_VP setFilter; + DBENTRYP_VP setLocate; + DBENTRYP_VP setScope; + DBENTRYP_VPL skipScope; /* Miscellaneous */ -// DBENTRYP_VP compile; -// DBENTRYP_VP error; -// DBENTRYP_I evalBlock; + DBENTRYP_VP compile; + DBENTRYP_VP error; + DBENTRYP_I evalBlock; /* Network operations */ -// DBENTRYP_VSP rawlock; -// DBENTRYP_VP lock; -// DBENTRYP_L unlock; + DBENTRYP_VSP rawlock; + DBENTRYP_VP lock; + DBENTRYP_L unlock; /* Memofile functions */ -// DBENTRYP_V closeMemFile; -// DBENTRYP_VP createMemFile; -// DBENTRYP_SVPB getValueFile; -// DBENTRYP_VP openMemFile; -// DBENTRYP_SVP putValueFile; + DBENTRYP_V closeMemFile; + DBENTRYP_VP createMemFile; + DBENTRYP_SVPB getValueFile; + DBENTRYP_VP openMemFile; + DBENTRYP_SVP putValueFile; /* Database file header handling */ -// DBENTRYP_V readDBHeader; + DBENTRYP_V readDBHeader; +#endif DBENTRYP_V writeDBHeader; /* Special and reserved methods */ -// DBENTRYP_SVP whoCares; +#if 0 + DBENTRYP_SVP whoCares; +#endif } RDDFUNCS; diff --git a/harbour/include/run_exp.h b/harbour/include/run_exp.h index d3697e34f0..faf7762006 100644 --- a/harbour/include/run_exp.h +++ b/harbour/include/run_exp.h @@ -135,7 +135,7 @@ HB_INIT_SYMBOLS_BEGIN( RUNNER ) { "VALTYPE", FS_PUBLIC, HB_VALTYPE , 0 }, { "__MVPUBLIC", FS_PUBLIC, HB___MVPUBLIC , 0 }, { "__MVPRIVATE", FS_PUBLIC, HB___MVPRIVATE , 0 } -HB_INIT_SYMBOLS_END( RUNNER ); +HB_INIT_SYMBOLS_END( RUNNER ) #if ! defined(__GNUC__) #pragma startup RUNNER #endif diff --git a/harbour/source/compiler/harbour.y b/harbour/source/compiler/harbour.y index bd04de5479..6d9da28fef 100644 --- a/harbour/source/compiler/harbour.y +++ b/harbour/source/compiler/harbour.y @@ -2468,7 +2468,7 @@ void GenCCode( char *szFileName, char *szName ) /* generates the C languag pSym = pSym->pNext; } - fprintf( yyc, "\nHB_INIT_SYMBOLS_END( %s__InitSymbols );\n", _pFileName->name ); + fprintf( yyc, "\nHB_INIT_SYMBOLS_END( %s__InitSymbols )\n", _pFileName->name ); fprintf( yyc, "#if ! defined(__GNUC__)\n#pragma startup %s__InitSymbols\n#endif\n\n\n", _pFileName->name ); /* Generate functions data diff --git a/harbour/source/hbpp/hbpp.c b/harbour/source/hbpp/hbpp.c index b320238ee8..d9ff5730fa 100644 --- a/harbour/source/hbpp/hbpp.c +++ b/harbour/source/hbpp/hbpp.c @@ -1197,15 +1197,15 @@ void SkipOptional( char** ptri, char *ptro, int* lenres ) case '[': nbr++; break; case ']': nbr--; break; case '\1': -// if ( numBrackets < 2 ) -// { +/* if ( numBrackets < 2 ) */ +/* { */ for ( lenpatt=0; lenpatt<4; lenpatt++ ) *(exppatt+lenpatt) = *((*ptri)++); (*ptri)--; if ( exppatt[2] == '2' ) while ( **ptri != '>' ) (*ptri)++; SearnRep( exppatt,"",0,ptro,lenres); -// } +/* } */ break; } (*ptri)++; @@ -1891,4 +1891,4 @@ BOOL OpenInclude( char * szFileName, PATHNAMES *pSearch, FILE** fptr, BOOL bStan } return ( *fptr ? TRUE : FALSE ); -} \ No newline at end of file +} diff --git a/harbour/source/hbpp/hbpplib.c b/harbour/source/hbpp/hbpplib.c index dc425f4de9..e938830108 100644 --- a/harbour/source/hbpp/hbpplib.c +++ b/harbour/source/hbpp/hbpplib.c @@ -49,7 +49,7 @@ HARBOUR HB_PREPROCESS(void); HB_INIT_SYMBOLS_BEGIN( Preprocess__InitSymbols ) { "PREPROCESS", FS_PUBLIC, HB_PREPROCESS , 0 } -HB_INIT_SYMBOLS_END( Preprocess__InitSymbols ); +HB_INIT_SYMBOLS_END( Preprocess__InitSymbols ) #if ! defined(__GNUC__) #pragma Preprocess__InitSymbols #endif diff --git a/harbour/source/hbpp/table.c b/harbour/source/hbpp/table.c index cc5fa04420..0b51862358 100644 --- a/harbour/source/hbpp/table.c +++ b/harbour/source/hbpp/table.c @@ -370,4 +370,4 @@ static COMMANDS sC___239 = {0,"SET","ORDER TO","ordSetFocus(0)",&sC___238 }; static COMMANDS sC___240 = {0,"ANNOUNCE","\1A10","procedure \1A00 ; return",&sC___239 }; COMMANDS *topCommand = &sC___240; - COMMANDS *topTranslate = NULL; \ No newline at end of file + COMMANDS *topTranslate = NULL; diff --git a/harbour/source/rdd/dbcmd.c b/harbour/source/rdd/dbcmd.c index b65a2009c2..a8c553fd6b 100644 --- a/harbour/source/rdd/dbcmd.c +++ b/harbour/source/rdd/dbcmd.c @@ -106,7 +106,7 @@ HB_INIT_SYMBOLS_BEGIN( dbCmd__InitSymbols ) { "RDDREGISTER", FS_PUBLIC, HB_RDDREGISTER, 0 }, { "RDDSETDEFAULT", FS_PUBLIC, HB_RDDSETDEFAULT, 0 }, { "RDDSHUTDOWN", FS_PUBLIC, HB_RDDSHUTDOWN, 0 } -HB_INIT_SYMBOLS_END( dbCmd__InitSymbols ); +HB_INIT_SYMBOLS_END( dbCmd__InitSymbols ) #if ! defined(__GNUC__) #pragma startup dbCmd__InitSymbols #endif diff --git a/harbour/source/rdd/dbf1.c b/harbour/source/rdd/dbf1.c index 8108c2c1a7..b2f42dc830 100644 --- a/harbour/source/rdd/dbf1.c +++ b/harbour/source/rdd/dbf1.c @@ -67,7 +67,7 @@ HARBOUR HB_DBF_GETFUNCTABLE( void ); HB_INIT_SYMBOLS_BEGIN( dbf1__InitSymbols ) { "_DBF", FS_PUBLIC, HB__DBF, 0 }, { "DBF_GETFUNCTABLE", FS_PUBLIC, HB_DBF_GETFUNCTABLE, 0 } -HB_INIT_SYMBOLS_END( dbf1__InitSymbols ); +HB_INIT_SYMBOLS_END( dbf1__InitSymbols ) #if ! defined(__GNUC__) #pragma startup dbf1__InitSymbols #endif diff --git a/harbour/source/rdd/dbfntx/dbfntx1.c b/harbour/source/rdd/dbfntx/dbfntx1.c index 123da28617..0676918ea7 100644 --- a/harbour/source/rdd/dbfntx/dbfntx1.c +++ b/harbour/source/rdd/dbfntx/dbfntx1.c @@ -34,7 +34,7 @@ HARBOUR HB_DBFNTX_GETFUNCTABLE( void ); HB_INIT_SYMBOLS_BEGIN( dbfntx1__InitSymbols ) { "_DBFNTX", FS_PUBLIC, HB__DBFNTX, 0 }, { "DBFNTX_GETFUNCTABLE", FS_PUBLIC, HB_DBFNTX_GETFUNCTABLE, 0 } -HB_INIT_SYMBOLS_END( dbfntx1__InitSymbols ); +HB_INIT_SYMBOLS_END( dbfntx1__InitSymbols ) #if ! defined(__GNUC__) #pragma startup dbfntx1__InitSymbols #endif diff --git a/harbour/source/rdd/delim1.c b/harbour/source/rdd/delim1.c index 702676d289..833902bddb 100644 --- a/harbour/source/rdd/delim1.c +++ b/harbour/source/rdd/delim1.c @@ -33,7 +33,7 @@ HARBOUR HB_DELIM_GETFUNCTABLE( void ); HB_INIT_SYMBOLS_BEGIN( delim1__InitSymbols ) { "_DELIM", FS_PUBLIC, HB__DELIM, 0 }, { "DELIM_GETFUNCTABLE", FS_PUBLIC, HB_DELIM_GETFUNCTABLE, 0 } -HB_INIT_SYMBOLS_END( delim1__InitSymbols ); +HB_INIT_SYMBOLS_END( delim1__InitSymbols ) #if ! defined(__GNUC__) #pragma startup delim1__InitSymbols #endif diff --git a/harbour/source/rdd/sdf1.c b/harbour/source/rdd/sdf1.c index f04c17b342..01c406a90e 100644 --- a/harbour/source/rdd/sdf1.c +++ b/harbour/source/rdd/sdf1.c @@ -33,7 +33,7 @@ HARBOUR HB_SDF_GETFUNCTABLE( void ); HB_INIT_SYMBOLS_BEGIN( sdf1__InitSymbols ) { "_SDF", FS_PUBLIC, HB__SDF, 0 }, { "SDF_GETFUNCTABLE", FS_PUBLIC, HB_SDF_GETFUNCTABLE, 0 } -HB_INIT_SYMBOLS_END( sdf1__InitSymbols ); +HB_INIT_SYMBOLS_END( sdf1__InitSymbols ) #if ! defined(__GNUC__) #pragma startup sdf1__InitSymbols #endif diff --git a/harbour/source/rtl/arrays.c b/harbour/source/rtl/arrays.c index 4fa7946c5a..31d4716f6f 100644 --- a/harbour/source/rtl/arrays.c +++ b/harbour/source/rtl/arrays.c @@ -55,7 +55,7 @@ HB_INIT_SYMBOLS_BEGIN( Arrays__InitSymbols ) { "ASIZE", FS_PUBLIC, HB_ASIZE , 0 }, { "ASORT", FS_PUBLIC, HB_ASORT , 0 }, { "ATAIL", FS_PUBLIC, HB_ATAIL , 0 }, -HB_INIT_SYMBOLS_END( Arrays__InitSymbols ); +HB_INIT_SYMBOLS_END( Arrays__InitSymbols ) #if ! defined(__GNUC__) #pragma startup Arrays__InitSymbols #endif diff --git a/harbour/source/rtl/classes.c b/harbour/source/rtl/classes.c index 7863d9af77..04e604a55c 100644 --- a/harbour/source/rtl/classes.c +++ b/harbour/source/rtl/classes.c @@ -164,7 +164,7 @@ HB_INIT_SYMBOLS_BEGIN( Classes__InitSymbols ) { "OMODINLINE" , FS_PUBLIC, HB_OMODINLINE , 0 }, { "OMODMETHOD" , FS_PUBLIC, HB_OMODMETHOD , 0 }, { "OSEND" , FS_PUBLIC, HB_OSEND , 0 } -HB_INIT_SYMBOLS_END( Classes__InitSymbols ); +HB_INIT_SYMBOLS_END( Classes__InitSymbols ) #if ! defined(__GNUC__) #pragma startup Classes__InitSymbols #endif diff --git a/harbour/source/rtl/console.c b/harbour/source/rtl/console.c index 467e920de2..1cd6516685 100644 --- a/harbour/source/rtl/console.c +++ b/harbour/source/rtl/console.c @@ -135,7 +135,7 @@ HB_INIT_SYMBOLS_BEGIN( Console__InitSymbols ) { "QOUT" , FS_PUBLIC, HB_QOUT , 0 }, { "QQOUT" , FS_PUBLIC, HB_QQOUT , 0 }, { "__COLORINDEX", FS_PUBLIC, HB___COLORINDEX, 0 } -HB_INIT_SYMBOLS_END( Console__InitSymbols ); +HB_INIT_SYMBOLS_END( Console__InitSymbols ) #if ! defined(__GNUC__) #pragma startup Console__InitSymbols #endif diff --git a/harbour/source/rtl/copyfile.c b/harbour/source/rtl/copyfile.c index 3e978feedf..8710b6fe7b 100644 --- a/harbour/source/rtl/copyfile.c +++ b/harbour/source/rtl/copyfile.c @@ -39,7 +39,7 @@ HARBOUR HB___COPYFILE(void); HB_INIT_SYMBOLS_BEGIN( CopyFile__InitSymbols ) { "__COPYFILE", FS_PUBLIC, HB___COPYFILE, 0 } -HB_INIT_SYMBOLS_END( CopyFile__InitSymbols ); +HB_INIT_SYMBOLS_END( CopyFile__InitSymbols ) #if ! defined(__GNUC__) #pragma CopyFile__InitSymbols #endif diff --git a/harbour/source/rtl/dates.c b/harbour/source/rtl/dates.c index eb8297e439..05a8e83739 100644 --- a/harbour/source/rtl/dates.c +++ b/harbour/source/rtl/dates.c @@ -70,7 +70,7 @@ HARBOUR HB_YEAR( void ); HB_INIT_SYMBOLS_BEGIN( Dates__InitSymbols ) { "STOD", FS_PUBLIC, HB_STOD, 0 } -HB_INIT_SYMBOLS_END( Dates__InitSymbols ); +HB_INIT_SYMBOLS_END( Dates__InitSymbols ) #if ! defined(__GNUC__) #pragma startup Dates__InitSymbols #endif diff --git a/harbour/source/rtl/descend.c b/harbour/source/rtl/descend.c index 0978c4de18..1d10357f19 100644 --- a/harbour/source/rtl/descend.c +++ b/harbour/source/rtl/descend.c @@ -70,7 +70,7 @@ HARBOUR HB_DESCEND(void); HB_INIT_SYMBOLS_BEGIN( Descend__InitSymbols ) { "DESCEND", FS_PUBLIC, HB_DESCEND, 0 } -HB_INIT_SYMBOLS_END( Descend__InitSymbols ); +HB_INIT_SYMBOLS_END( Descend__InitSymbols ) #if ! defined(__GNUC__) #pragma Descend__InitSymbols #endif diff --git a/harbour/source/rtl/dir.c b/harbour/source/rtl/dir.c index 2b28f90b04..613228e9af 100644 --- a/harbour/source/rtl/dir.c +++ b/harbour/source/rtl/dir.c @@ -130,7 +130,7 @@ HARBOUR HB_DIRECTORY(void); HB_INIT_SYMBOLS_BEGIN( Dir__InitSymbols ) { "DIRECTORY", FS_PUBLIC, HB_DIRECTORY, 0 } -HB_INIT_SYMBOLS_END( Dir__InitSymbols ); +HB_INIT_SYMBOLS_END( Dir__InitSymbols ) #if ! defined(__GNUC__) #pragma startup Dir__InitSymbols #endif diff --git a/harbour/source/rtl/environ.c b/harbour/source/rtl/environ.c index 1fe67080ab..a1781f4ac0 100644 --- a/harbour/source/rtl/environ.c +++ b/harbour/source/rtl/environ.c @@ -54,7 +54,7 @@ HB_INIT_SYMBOLS_BEGIN( Environ__InitSymbols ) { "GETENV" , FS_PUBLIC, HB_GETENV , 0 }, { "OS" , FS_PUBLIC, HB_OS , 0 }, { "VERSION", FS_PUBLIC, HB_VERSION, 0 } -HB_INIT_SYMBOLS_END( Environ__InitSymbols ); +HB_INIT_SYMBOLS_END( Environ__InitSymbols ) #if ! defined(__GNUC__) #pragma startup Environ__InitSymbols #endif diff --git a/harbour/source/rtl/filesys.c b/harbour/source/rtl/filesys.c index 6c3ed4a4f5..9ee2d13153 100644 --- a/harbour/source/rtl/filesys.c +++ b/harbour/source/rtl/filesys.c @@ -159,7 +159,7 @@ HB_INIT_SYMBOLS_BEGIN( Files__InitSymbols ) { "I2BIN" , FS_PUBLIC, HB_I2BIN , 0 }, { "L2BIN" , FS_PUBLIC, HB_L2BIN , 0 }, { "W2BIN" , FS_PUBLIC, HB_W2BIN , 0 } -HB_INIT_SYMBOLS_END( Files__InitSymbols ); +HB_INIT_SYMBOLS_END( Files__InitSymbols ) #if ! defined(__GNUC__) #pragma startup Files__InitSymbols #endif diff --git a/harbour/source/rtl/hardcr.c b/harbour/source/rtl/hardcr.c index 8e060d342b..bb60b96b20 100644 --- a/harbour/source/rtl/hardcr.c +++ b/harbour/source/rtl/hardcr.c @@ -72,7 +72,7 @@ HARBOUR HB_HARDCR(void); HB_INIT_SYMBOLS_BEGIN( HardCR__InitSymbols ) { "HARDCR", FS_PUBLIC, HB_HARDCR, 0 } -HB_INIT_SYMBOLS_END( HardCR__InitSymbols ); +HB_INIT_SYMBOLS_END( HardCR__InitSymbols ) #if ! defined(__GNUC__) #pragma startup HardCR__InitSymbols #endif diff --git a/harbour/source/rtl/inkey.c b/harbour/source/rtl/inkey.c index 2bae395985..096ffc9956 100644 --- a/harbour/source/rtl/inkey.c +++ b/harbour/source/rtl/inkey.c @@ -90,7 +90,7 @@ HB_INIT_SYMBOLS_BEGIN( INKEY__InitSymbols ) { "INKEY" , FS_PUBLIC, HB_INKEY , 0 }, { "LASTKEY" , FS_PUBLIC, HB_LASTKEY , 0 }, { "NEXTKEY" , FS_PUBLIC, HB_NEXTKEY , 0 }, -HB_INIT_SYMBOLS_END( INKEY__InitSymbols ); +HB_INIT_SYMBOLS_END( INKEY__InitSymbols ) #if ! defined(__GNUC__) #pragma startup INKEY__InitSymbols #endif diff --git a/harbour/source/rtl/math.c b/harbour/source/rtl/math.c index 16b2da3229..6248343085 100644 --- a/harbour/source/rtl/math.c +++ b/harbour/source/rtl/math.c @@ -27,7 +27,7 @@ HARBOUR HB_SQRT( void ); HB_INIT_SYMBOLS_BEGIN( Math__InitSymbols ) { "MOD" , FS_PUBLIC, HB_MOD , 0 } -HB_INIT_SYMBOLS_END( Math__InitSymbols ); +HB_INIT_SYMBOLS_END( Math__InitSymbols ) #if ! defined(__GNUC__) #pragma startup Math__InitSymbols #endif diff --git a/harbour/source/rtl/mtran.c b/harbour/source/rtl/mtran.c index f041962735..dda0812570 100644 --- a/harbour/source/rtl/mtran.c +++ b/harbour/source/rtl/mtran.c @@ -78,7 +78,7 @@ HARBOUR HB_MEMOTRAN(void); HB_INIT_SYMBOLS_BEGIN( Memotran__InitSymbols ) { "MEMOTRAN", FS_PUBLIC, HB_MEMOTRAN, 0 } -HB_INIT_SYMBOLS_END( Memotran__InitSymbols ); +HB_INIT_SYMBOLS_END( Memotran__InitSymbols ) #if ! defined(__GNUC__) #pragma startup Memotran__InitSymbols #endif diff --git a/harbour/source/rtl/set.c b/harbour/source/rtl/set.c index 9dc50768f9..3b9efc666f 100644 --- a/harbour/source/rtl/set.c +++ b/harbour/source/rtl/set.c @@ -189,7 +189,7 @@ HARBOUR HB___SETCENTURY( void ); HB_INIT_SYMBOLS_BEGIN( Set__InitSymbols ) { "__SETCENTURY", FS_PUBLIC, HB___SETCENTURY, 0 }, { "SET" , FS_PUBLIC, HB_SET , 0 } -HB_INIT_SYMBOLS_END( Set__InitSymbols ); +HB_INIT_SYMBOLS_END( Set__InitSymbols ) #if ! defined(__GNUC__) #pragma startup Set__InitSymbols #endif diff --git a/harbour/source/rtl/setcolor.c b/harbour/source/rtl/setcolor.c index 73e3e3f20e..d17a9fb2e6 100644 --- a/harbour/source/rtl/setcolor.c +++ b/harbour/source/rtl/setcolor.c @@ -37,7 +37,7 @@ HARBOUR HB_COLORSELECT( void ); HB_INIT_SYMBOLS_BEGIN( SETCOLOR__InitSymbols ) { "SETCOLOR" , FS_PUBLIC, HB_SETCOLOR , 0 }, { "COLORSELECT" , FS_PUBLIC, HB_COLORSELECT, 0 } -HB_INIT_SYMBOLS_END( SETCOLOR__InitSymbols ); +HB_INIT_SYMBOLS_END( SETCOLOR__InitSymbols ) #if ! defined(__GNUC__) #pragma startup SETCOLOR__InitSymbols #endif diff --git a/harbour/source/rtl/strings.c b/harbour/source/rtl/strings.c index 5e4b07b619..19063d22a9 100644 --- a/harbour/source/rtl/strings.c +++ b/harbour/source/rtl/strings.c @@ -83,7 +83,7 @@ HB_INIT_SYMBOLS_BEGIN( Strings__InitSymbols ) { "RIGHT" , FS_PUBLIC, HB_RIGHT , 0 }, { "STRTRAN" , FS_PUBLIC, HB_STRTRAN, 0 }, { "STUFF" , FS_PUBLIC, HB_STUFF , 0 } -HB_INIT_SYMBOLS_END( Strings__InitSymbols ); +HB_INIT_SYMBOLS_END( Strings__InitSymbols ) #if ! defined(__GNUC__) #pragma startup Strings__InitSymbols #endif @@ -93,7 +93,7 @@ HB_INIT_SYMBOLS_END( Strings__InitSymbols ); #ifdef HARBOUR_STRICT_CLIPPER_COMPATIBILITY HB_CALL_ON_STARTUP_BEGIN( Strings_InitInfinity ) infinity = -log( 0 ); -HB_CALL_ON_STARTUP_END( Strings_InitInfinity ); +HB_CALL_ON_STARTUP_END( Strings_InitInfinity ) #if ! defined(__GNUC__) #pragma startup Strings_InitInfinity #endif diff --git a/harbour/source/rtl/tone.c b/harbour/source/rtl/tone.c index a6ac836658..69a538da04 100644 --- a/harbour/source/rtl/tone.c +++ b/harbour/source/rtl/tone.c @@ -105,7 +105,7 @@ HARBOUR HB_TONE(void); HB_INIT_SYMBOLS_BEGIN( Tone__InitSymbols ) { "TONE", FS_PUBLIC, HB_TONE, 0 } -HB_INIT_SYMBOLS_END( Tone__InitSymbols ); +HB_INIT_SYMBOLS_END( Tone__InitSymbols ) #if ! defined(__GNUC__) #pragma startup Tone__InitSymbols #endif diff --git a/harbour/source/rtl/transfrm.c b/harbour/source/rtl/transfrm.c index c41bf585a2..71ef4d30f1 100644 --- a/harbour/source/rtl/transfrm.c +++ b/harbour/source/rtl/transfrm.c @@ -57,7 +57,7 @@ HARBOUR HB_TRANSFORM( void ); HB_INIT_SYMBOLS_BEGIN( Transfrm__InitSymbols ) { "TRANSFORM" , FS_PUBLIC, HB_TRANSFORM , 0 } -HB_INIT_SYMBOLS_END( Transfrm__InitSymbols ); +HB_INIT_SYMBOLS_END( Transfrm__InitSymbols ) #if ! defined(__GNUC__) #pragma startup Transfrm__InitSymbols #endif diff --git a/harbour/source/tools/dates2.c b/harbour/source/tools/dates2.c index 7c34727dfd..fb663078f5 100644 --- a/harbour/source/tools/dates2.c +++ b/harbour/source/tools/dates2.c @@ -68,7 +68,7 @@ HB_INIT_SYMBOLS_BEGIN( Dates2__InitSymbols ) { "ISLEAPYEAR", FS_PUBLIC, HB_ISLEAPYEAR , 0 }, { "WOM", FS_PUBLIC, HB_WOM , 0 }, { "WOY", FS_PUBLIC, HB_WOY , 0 } -HB_INIT_SYMBOLS_END( Dates2__InitSymbols ); +HB_INIT_SYMBOLS_END( Dates2__InitSymbols ) #if ! defined(__GNUC__) #pragma startup Dates2__InitSymbols #endif diff --git a/harbour/source/vm/dynsym.c b/harbour/source/vm/dynsym.c index 4d5aa9b007..4103f8c4bf 100644 --- a/harbour/source/vm/dynsym.c +++ b/harbour/source/vm/dynsym.c @@ -28,7 +28,7 @@ #include "extend.h" -#define SYM_ALLOCATED -1 +#define SYM_ALLOCATED ((SYMBOLSCOPE)-1) typedef struct { diff --git a/harbour/source/vm/hvm.c b/harbour/source/vm/hvm.c index 9428079681..efe7b7f449 100644 --- a/harbour/source/vm/hvm.c +++ b/harbour/source/vm/hvm.c @@ -421,7 +421,7 @@ void hb_vmExecute( BYTE * pCode, PHB_SYMB pSymbols ) break; case HB_P_POP: - hb_stackPop(); + hb_stackPop(); w++; break; @@ -770,7 +770,7 @@ void hb_vmDec( void ) void hb_vmDimArray( WORD wDimensions ) /* generates a wDimensions Array and initialize those dimensions from the stack values */ { HB_ITEM itArray; - WORD w; // , wElements; + WORD w; /* , wElements; */ itArray.type = IT_NIL; hb_arrayNew( &itArray, ( stack.pPos - wDimensions )->item.asLong.value ); @@ -781,9 +781,11 @@ void hb_vmDimArray( WORD wDimensions ) /* generates a wDimensions Array and init exit( 1 ); } - // for( w = 0; w < wElements; w++ ) - // hb_itemCopy( itArray.item.asArray.value->pItems + w, - // stack.pPos - wElements + w ); +/* + for( w = 0; w < wElements; w++ ) + hb_itemCopy( itArray.item.asArray.value->pItems + w, + stack.pPos - wElements + w ); +*/ for( w = 0; w < wDimensions; w++ ) hb_stackPop(); @@ -1736,7 +1738,7 @@ static void PushAliasedField( PHB_SYMB pSym ) stack.pPos->item.asInteger.decimal = 0; hb_stackPush(); HB_DEBUG( "PushAliasedField\n" ); -} +} void hb_vmPushLogical( BOOL bValue ) {