fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2000-06-07 22:50 UTC-0800 Ron Pinkas <Ron@Profit-Master.com>

Browse Source 
* source/compiler/harbour.c
     * main() Moved calls to hb_pp_init() to hb_pp_SetRules() in ppcore.c to avoid redefinition of standard defs.

   * source/pp/ppcore.c
     * hb_pp_SetRules() Moved calls to hb_pp_init() from main() in Harbour.c to avoid redefinition of standard defs.
     ! Minor fixes to warnings and errors.
This commit is contained in:
Ron Pinkas
2000-06-08 05:50:09 +00:00
parent e5f03d9691
commit 52c70a7db3
3 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
harbour/ChangeLog
View File

@@ -1,4 +1,13 @@
2000-06-05 19:50 UTC-0800 Ron Pinkas <Ron@Profit-Master.com>
2000-06-07 22:50 UTC-0800 Ron Pinkas <Ron@Profit-Master.com>
* source/compiler/harbour.c
* main() Moved calls to hb_pp_init() to hb_pp_SetRules() in ppcore.c to avoid redefinition of standard defs.
* source/pp/ppcore.c
* hb_pp_SetRules() Moved calls to hb_pp_init() from main() in Harbour.c to avoid redefinition of standard defs.
! Minor fixes to warnings and errors.
2000-06-07 21:40 UTC-0800 Ron Pinkas <Ron@Profit-Master.com>
* source/pp/ppcore.c
* Changed hb_pp_SetRules() to only always default to .CH extension, if file name supplied without extension.

3
harbour/source/compiler/harbour.c
View File

@@ -3406,9 +3406,6 @@ int hb_compCompile( char * szPrg, int argc, char * argv[] )
}
else
{
/* Initialization of preprocessor arrays */
hb_pp_Init();
/* Add /D command line or envvar defines */
hb_compChkDefines( argc, argv );

9
harbour/source/pp/ppcore.c
View File

@@ -196,7 +196,7 @@ char * hb_pp_szErrors[] =
char * hb_pp_szWarnings[] =
{
"1Redefinition or duplicate definition of #define %s",
"No directives found in: %s%s\n"
"1No directives in command definitions file"
};
void hb_pp_SetRules( BOOL (*hb_compInclude)(char *, PATHNAMES * ) )
@@ -262,7 +262,7 @@ void hb_pp_SetRules( BOOL (*hb_compInclude)(char *, PATHNAMES * ) )
}
else
{
hb_compGenWarning( hb_pp_szWarnings, 'W', HB_PP_WARN_NO_DIRECTIVES, szFileName, NULL );
hb_compGenWarning( hb_pp_szWarnings, 'I', HB_PP_WARN_NO_DIRECTIVES, NULL /*szFileName*/, NULL );
}
fclose( hb_comp_files.pLast->handle );
@@ -291,12 +291,15 @@ void hb_pp_SetRules( BOOL (*hb_compInclude)(char *, PATHNAMES * ) )
else
{
if( ! hb_comp_bQuiet )
printf( "Standard Rules excluded!\n" );
printf( "Standard command definitions excluded!\n" );
hb_pp_Init();
}
}
else
{
hb_pp_Table();
hb_pp_Init();
}
}