From 5547989f44cc4fd3af1d35d12894ac393bfb94d3 Mon Sep 17 00:00:00 2001 From: law Date: Fri, 15 Oct 1999 06:02:01 +0000 Subject: [PATCH] * fixinc/inclhack.def: Restore patch lost during last merge of "no_bogosity" branch. * fixinc/inclhack.sh, fixinc/fixincl.x: Rebuilt. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@30005 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 6 ++++++ gcc/fixinc/fixincl.x | 2 +- gcc/fixinc/inclhack.def | 2 +- gcc/fixinc/inclhack.sh | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 821d30c..45db007 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +Fri Oct 15 00:00:24 1999 Loren J. Rittle + + * 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 * fixincludes: Add a HPUX 11 fix for inttypes.h. diff --git a/gcc/fixinc/fixincl.x b/gcc/fixinc/fixincl.x index a8d2ebc..ce256a5 100644 --- 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 ac09792..266f3ae 100644 --- 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 ab0f553..00bde35 100755 --- 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__@' \ -- 2.7.4