diff options
| author | Jason Merrill <jason@yorick.cygnus.com> | 2000-01-14 01:46:49 +0000 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2000-01-13 20:46:49 -0500 |
| commit | 91baa9184150434e144761ba1720a048c4b515f0 (patch) | |
| tree | aa3756fd98d274e15267c37b66a0af86f53a19a2 | |
| parent | 17ca0d816a1c9d73e09a119937b0b0ff2e88d41d (diff) | |
| download | gcc-91baa9184150434e144761ba1720a048c4b515f0.tar.gz | |
fixincludes (va_list): Use __not_va_list__ for the dummy.
* fixincludes (va_list): Use __not_va_list__ for the dummy.
* fixinc/*: Likewise.
From-SVN: r31401
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rwxr-xr-x | gcc/fixinc/fixinc.irix | 4 | ||||
| -rw-r--r-- | gcc/fixinc/fixinc.ptx | 6 | ||||
| -rw-r--r-- | gcc/fixinc/inclhack.def | 6 | ||||
| -rwxr-xr-x | gcc/fixinc/inclhack.sh | 4 | ||||
| -rwxr-xr-x | gcc/fixincludes | 6 |
6 files changed, 18 insertions, 13 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 78de29041db..d1ff7358ef6 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2000-01-13 Jason Merrill <jason@yorick.cygnus.com> + + * fixincludes (va_list): Use __not_va_list__ for the dummy. + * fixinc/*: Likewise. + 2000-01-13 Kaveh R. Ghazi <ghazi@caip.rutgers.edu> * cccp.c: PROTO -> PARAMS. diff --git a/gcc/fixinc/fixinc.irix b/gcc/fixinc/fixinc.irix index 24a045afbda..a6ddc0c5904 100755 --- a/gcc/fixinc/fixinc.irix +++ b/gcc/fixinc/fixinc.irix @@ -255,8 +255,8 @@ if [ \! -z "$file_to_fix" ]; then -e 's@ 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__@' \ + -e 's@ va_list@ __not_va_list__@' \ + -e 's@\*va_list@*__not_va_list__@' \ -e 's@ __va_list)@ __gnuc_va_list)@' \ -e 's@GNUC_VA_LIST@GNUC_Va_LIST@' \ -e 's@_NEED___VA_LIST@_NEED___Va_LIST@' \ diff --git a/gcc/fixinc/fixinc.ptx b/gcc/fixinc/fixinc.ptx index c205e217d36..88518bebbcb 100644 --- a/gcc/fixinc/fixinc.ptx +++ b/gcc/fixinc/fixinc.ptx @@ -96,13 +96,13 @@ if [ -r ${LIB}/$file ]; then # Use __gnuc_va_list in arg types in place of va_list. # On 386BSD use __gnuc_va_list instead of _VA_LIST_. We're hoping the # trailing parentheses and semicolon save all other systems from this. - # Define __va_list__ (something harmless and unused) instead of va_list. + # Define __not_va_list__ (something harmless and unused) instead of va_list. # Don't claim to have defined va_list. sed -e 's@ va_list @ __gnuc_va_list @' \ -e 's@ va_list)@ __gnuc_va_list)@' \ -e 's@ _VA_LIST_));@ __gnuc_va_list));@' \ - -e 's@ va_list@ __va_list__@' \ - -e 's@\*va_list@*__va_list__@' \ + -e 's@ va_list@ __not_va_list__@' \ + -e 's@\*va_list@*__not_va_list__@' \ -e 's@ __va_list)@ __gnuc_va_list)@' \ -e 's@_NEED___VA_LIST@_NEED___Va_LIST@' \ -e 's@VA_LIST@DUMMY_VA_LIST@' \ diff --git a/gcc/fixinc/inclhack.def b/gcc/fixinc/inclhack.def index 25f99ece091..d83ac73386f 100644 --- a/gcc/fixinc/inclhack.def +++ b/gcc/fixinc/inclhack.def @@ -1743,7 +1743,7 @@ fix = { * Use __gnuc_va_list in arg types in place of va_list. * On 386BSD use __gnuc_va_list instead of _VA_LIST_. We're hoping the * trailing parentheses and semicolon save all other systems from this. - * Define __va_list__ (something harmless and unused) instead of va_list. + * Define __not_va_list__ (something harmless and unused) instead of va_list. * Don't claim to have defined va_list. */ shell = @@ -1758,8 +1758,8 @@ fix = { -e 's@ 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__@' \\ + -e 's@ va_list@ __not_va_list__@' \\ + -e 's@\\*va_list@*__not_va_list__@' \\ -e 's@ __va_list)@ __gnuc_va_list)@' \\ -e 's@GNUC_VA_LIST@GNUC_Va_LIST@' \\ -e 's@_NEED___VA_LIST@_NEED___Va_LIST@' \\ diff --git a/gcc/fixinc/inclhack.sh b/gcc/fixinc/inclhack.sh index 0dcc3a4636c..29b255461b2 100755 --- a/gcc/fixinc/inclhack.sh +++ b/gcc/fixinc/inclhack.sh @@ -2504,8 +2504,8 @@ typedef __regmatch_t regmatch_t; -e 's@ 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__@' \ + -e 's@ va_list@ __not_va_list__@' \ + -e 's@\*va_list@*__not_va_list__@' \ -e 's@ __va_list)@ __gnuc_va_list)@' \ -e 's@GNUC_VA_LIST@GNUC_Va_LIST@' \ -e 's@_NEED___VA_LIST@_NEED___Va_LIST@' \ diff --git a/gcc/fixincludes b/gcc/fixincludes index 8c5843ae20b..2458a931555 100755 --- a/gcc/fixincludes +++ b/gcc/fixincludes @@ -1798,14 +1798,14 @@ if [ -r ${LIB}/$file ]; then # Use __gnuc_va_list in arg types in place of va_list. # On 386BSD use __gnuc_va_list instead of _VA_LIST_. We're hoping the # trailing parentheses and semicolon save all other systems from this. - # Define __va_list__ (something harmless and unused) instead of va_list. + # Define __not_va_list__ (something harmless and unused) instead of va_list. # Don't claim to have defined va_list. 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@ _VA_LIST_));@ __gnuc_va_list));@' \ - -e 's@ va_list@ __va_list__@' \ - -e 's@\*va_list@*__va_list__@' \ + -e 's@ va_list@ __not_va_list__@' \ + -e 's@\*va_list@*__not_va_list__@' \ -e 's@ __va_list)@ __gnuc_va_list)@' \ -e 's@GNUC_VA_LIST@GNUC_Va_LIST@' \ -e 's@_NEED___VA_LIST@_NEED___Va_LIST@' \ |