aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/fixinc/fixincl.x2
-rw-r--r--gcc/fixinc/inclhack.def1
3 files changed, 8 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f29d3b9..f523e43 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2000-10-17 J. David Anglin <dave@hiauly1.hia.nrc.ca>
+
+ * inclhack.def (hpux_maxint): Also apply fix to values.h.
+ * fixincl.x: Rebuilt.
+
2000-10-17 Alexandre Oliva <aoliva@redhat.com>
* genrecog.c (write_switch): Return the first condition that needs a
@@ -37,6 +42,7 @@
to be used along with -shared, and document the subtle failure that
may occur otherwise.
+>>>>>>> 1.7984
2000-10-16 J. David Anglin <dave@hiauly1.hia.nrc.ca>
* pa.md (return_internal): Move `use' after `return'.
diff --git a/gcc/fixinc/fixincl.x b/gcc/fixinc/fixincl.x
index c226081..0bfc7d3 100644
--- a/gcc/fixinc/fixincl.x
+++ b/gcc/fixinc/fixincl.x
@@ -2094,7 +2094,7 @@ tSCC zHpux_MaxintName[] =
* File name selection pattern
*/
tSCC zHpux_MaxintList[] =
- "|sys/param.h|";
+ "|sys/param.h|values.h|";
/*
* Machine/OS name selection pattern
*/
diff --git a/gcc/fixinc/inclhack.def b/gcc/fixinc/inclhack.def
index c5f9bdc..b461216 100644
--- a/gcc/fixinc/inclhack.def
+++ b/gcc/fixinc/inclhack.def
@@ -1206,6 +1206,7 @@ fix = {
fix = {
hackname = hpux_maxint;
files = sys/param.h;
+ files = values.h;
select = "^#[ \t]*define[ \t]*MAXINT[ \t]";
c_fix = format;