inclhack.def: Restore patch lost during last merge of "no_bogosity" branch.

        * fixinc/inclhack.def: Restore patch lost during last merge of
        "no_bogosity" branch.
        * fixinc/inclhack.sh, fixinc/fixincl.x: Rebuilt.

From-SVN: r30005

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 821d30c790f7bd757fc52ecbbac2a2c3952bf303..45db0074ca4832b847f7949abf1f2a275739e1c2 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+Fri Oct 15 00:00:24 1999  Loren J. Rittle <ljrittle@acm.org>
+
+       * fixinc/inclhack.def: Restore patch lost during last merge of
+       "no_bogosity" branch.
+       * fixinc/inclhack.sh, fixinc/fixincl.x: Rebuilt.
+
 Thu Oct 14 23:57:56 1999  Gavin Romig-Koch  <gavin@cygnus.com>
 
        * fixincludes: Add a HPUX 11 fix for inttypes.h.

diff --git a/gcc/fixinc/fixincl.x b/gcc/fixinc/fixincl.x
index a8d2ebc500dd3fffc6b2361d2e7ec90fe408d28c..ce256a56e74ef561f3e97d7f0e82ee152127711a 100644 (file)
--- a/gcc/fixinc/fixincl.x
+++ b/gcc/fixinc/fixincl.x
@@ -2730,7 +2730,7 @@ const char* apzStdio_Va_ListPatch[] = { "sh", "-c",
 \n\
   sed -e 's@ va_list @ __gnuc_va_list @' \\\n\
       -e 's@ va_list)@ __gnuc_va_list)@' \\\n\
-      -e 's@ _BSD_VA_LIST_));@ __gnuc_va_list));@' \\\n\
+      -e 's@ _BSD_VA_LIST_))@ __gnuc_va_list))@' \\\n\
       -e 's@ _VA_LIST_));@ __gnuc_va_list));@' \\\n\
       -e 's@ va_list@ __va_list__@' \\\n\
       -e 's@\\*va_list@*__va_list__@' \\\n\

diff --git a/gcc/fixinc/inclhack.def b/gcc/fixinc/inclhack.def
index ac0979237e1ab8439900e7d8d9b51d7ba0992d70..266f3aeb56b143e308cae9a48e2b8751441d10ac 100644 (file)
--- a/gcc/fixinc/inclhack.def
+++ b/gcc/fixinc/inclhack.def
@@ -1571,7 +1571,7 @@ fix = {
 
   sed -e 's@ va_list @ __gnuc_va_list @' \\
       -e 's@ va_list)@ __gnuc_va_list)@' \\
-      -e 's@ _BSD_VA_LIST_));@ __gnuc_va_list));@' \\
+      -e 's@ _BSD_VA_LIST_))@ __gnuc_va_list))@' \\
       -e 's@ _VA_LIST_));@ __gnuc_va_list));@' \\
       -e 's@ va_list@ __va_list__@' \\
       -e 's@\\*va_list@*__va_list__@' \\

diff --git a/gcc/fixinc/inclhack.sh b/gcc/fixinc/inclhack.sh
index ab0f5530836498b9de73974fa34e30a2c43d1041..00bde357032be2ea965eb11a06b8820b3e4e1613 100755 (executable)
--- a/gcc/fixinc/inclhack.sh
+++ b/gcc/fixinc/inclhack.sh
@@ -2162,7 +2162,7 @@ typedef __regmatch_t      regmatch_t;
 
   sed -e 's@ va_list @ __gnuc_va_list @' \
       -e 's@ va_list)@ __gnuc_va_list)@' \
-      -e 's@ _BSD_VA_LIST_));@ __gnuc_va_list));@' \
+      -e 's@ _BSD_VA_LIST_))@ __gnuc_va_list))@' \
       -e 's@ _VA_LIST_));@ __gnuc_va_list));@' \
       -e 's@ va_list@ __va_list__@' \
       -e 's@\*va_list@*__va_list__@' \