diff options
| author | korbb <korbb@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-11-30 16:43:00 +0000 |
|---|---|---|
| committer | korbb <korbb@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-11-30 16:43:00 +0000 |
| commit | 2ef2faefda3a7546e558e645ff30c21e6583f313 (patch) | |
| tree | ae41a80df3bf21141b3f2e8eb97820cba4f85567 | |
| parent | 7fb260d02ef3520aaed7841b36529c619e15cfa3 (diff) | |
| download | ppe42-gcc-2ef2faefda3a7546e558e645ff30c21e6583f313.tar.gz ppe42-gcc-2ef2faefda3a7546e558e645ff30c21e6583f313.zip | |
prevent dual double definition protection
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@37895 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/fixinc/fixincl.x | 22 | ||||
| -rw-r--r-- | gcc/fixinc/inclhack.def | 7 |
3 files changed, 29 insertions, 6 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index d3c8c1374b4..65855dde6eb 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -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 diff --git a/gcc/fixinc/fixincl.x b/gcc/fixinc/fixincl.x index ddfe5a5d226..9942790113e 100644 --- a/gcc/fixinc/fixincl.x +++ b/gcc/fixinc/fixincl.x @@ -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 diff --git a/gcc/fixinc/inclhack.def b/gcc/fixinc/inclhack.def index a172593cdc5..1b73f0c11d4 100644 --- a/gcc/fixinc/inclhack.def +++ b/gcc/fixinc/inclhack.def @@ -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'; }; |
