MatCat.OpenSource/8sa1-gcc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

prevent dual double definition protection

Browse Source 
Co-Authored-By: Bruce Korb <bkorb@gnu.org>

From-SVN: r37895
This commit is contained in:
J. David Anglin 2000-11-30 16:43:00 +00:00 committed by Bruce Korb
parent 42cfed3714
commit 039df8c7c7
3 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/ChangeLog
View File

@ -1,3 +1,9 @@
2000-11-30 J. David Anglin <dave.anglin@nrc.ca>
Bruce Korb <bkorb@gnu.org>
* fixinc/inclhack.def(): prevent dual double definition protection
* fixinc/fixincl.x: regenerate
2000-11-29 Loren J. Rittle <ljrittle@acm.org>
* fixinc/Makefile.in (fixincl.x): Explicitly state the

22
gcc/fixinc/fixincl.x
View File

@ -2140,10 +2140,24 @@ tSCC zHpux_MaxintList[] =
* content selection pattern - do fix if pattern found
*/
tSCC zHpux_MaxintSelect0[] =
"^#[ \t]*define[ \t]*MAXINT[ \t]";
"^#[ \t]*define[ \t]+MAXINT[ \t]";
#define HPUX_MAXINT_TEST_CT 1
/*
* content bypass pattern - skip fix if pattern found
*/
tSCC zHpux_MaxintBypass0[] =
"^#[ \t]*ifndef[ \t]+MAXINT";
/*
* perform the 'test' shell command - do fix on success
*/
tSCC zHpux_MaxintTest0[] =
"-n \"`egrep '#[ \t]*define[ \t]+MAXINT[ \t]' sys/param.h`\"";
#define HPUX_MAXINT_TEST_CT 3
static tTestDesc aHpux_MaxintTests[] = {
{ TT_TEST, zHpux_MaxintTest0, 0 /* unused */ },
{ TT_NEGREP, zHpux_MaxintBypass0, (regex_t*)NULL },
{ TT_EGREP, zHpux_MaxintSelect0, (regex_t*)NULL }, };
/*
@ -2154,7 +2168,7 @@ static const char* apzHpux_MaxintPatch[] = {
"#ifndef MAXINT\n\
%0\n\
#endif",
"^#[ \t]*define[ \t]*MAXINT[ \t].*",
"^#[ \t]*define[ \t]+MAXINT[ \t].*",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
@ -5265,7 +5279,7 @@ static const char* apzX11_SprintfPatch[] = {
*
* List of all fixes
*/
#define REGEX_COUNT 134
#define REGEX_COUNT 135
#define MACH_LIST_SIZE_LIMIT 279
#define FIX_COUNT 130

7
gcc/fixinc/inclhack.def
View File

@ -1221,11 +1221,14 @@ fix = {
hackname = hpux_maxint;
files = sys/param.h;
files = values.h;
select = "^#[ \t]*define[ \t]*MAXINT[ \t]";
select = "^#[ \t]*define[ \t]+MAXINT[ \t]";
bypass = "^#[ \t]*ifndef[ \t]+MAXINT";
test =
"-n \"`egrep '#[ \t]*define[ \t]+MAXINT[ \t]' sys/param.h`\"";
c_fix = format;
c_fix_arg = "#ifndef MAXINT\n%0\n#endif";
c_fix_arg = "^#[ \t]*define[ \t]*MAXINT[ \t].*";
c_fix_arg = "^#[ \t]*define[ \t]+MAXINT[ \t].*";
test_text = '#define MAXINT 0x7FFFFFFF';
};