diff options
| author | Laurynas Biveinis <lauras@softhome.net> | 2000-12-14 06:11:40 +0000 |
|---|---|---|
| committer | Bruce Korb <korbb@gcc.gnu.org> | 2000-12-14 06:11:40 +0000 |
| commit | 413c5c85ca7279123136a308e51d0270857db518 (patch) | |
| tree | 2d36a446a27e92e0b472c2d79b465c400cbef8a4 | |
| parent | e9e42530cdf86f1185964cac16dd9ff162f7ec3f (diff) | |
| download | gcc-413c5c85ca7279123136a308e51d0270857db518.zip gcc-413c5c85ca7279123136a308e51d0270857db518.tar.gz gcc-413c5c85ca7279123136a308e51d0270857db518.tar.bz2 | |
skip stdio_va_list fix if __DJ_va_list found in a header
From-SVN: r38242
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/fixinc/fixincl.x | 2 | ||||
| -rw-r--r-- | gcc/fixinc/inclhack.def | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 1cb2445..0208053 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2000-12-13 Laurynas Biveinis <lauras@softhome.net> + + * fixinc/inclhack.def: skip stdio_va_list fix if __DJ_va_list + found in a header. + * fixinc/fixincl.x: regenerated. + 2000-12-13 DJ Delorie <dj@redhat.com> * config.gcc (cygwin, win32, mingw32): Use float-i386.h. diff --git a/gcc/fixinc/fixincl.x b/gcc/fixinc/fixincl.x index 3203b67..f64d29e 100644 --- a/gcc/fixinc/fixincl.x +++ b/gcc/fixinc/fixincl.x @@ -3679,7 +3679,7 @@ tSCC zStdio_Va_ListList[] = * content bypass pattern - skip fix if pattern found */ tSCC zStdio_Va_ListBypass0[] = - "__gnuc_va_list|_BSD_VA_LIST_"; + "__gnuc_va_list|_BSD_VA_LIST_|__DJ_va_list"; #define STDIO_VA_LIST_TEST_CT 1 static tTestDesc aStdio_Va_ListTests[] = { diff --git a/gcc/fixinc/inclhack.def b/gcc/fixinc/inclhack.def index 41ee2cd..1c128a9 100644 --- a/gcc/fixinc/inclhack.def +++ b/gcc/fixinc/inclhack.def @@ -2011,7 +2011,7 @@ fix = { fix = { hackname = stdio_va_list; files = stdio.h; - bypass = '__gnuc_va_list|_BSD_VA_LIST_'; + bypass = '__gnuc_va_list|_BSD_VA_LIST_|__DJ_va_list'; /* * Use __gnuc_va_list in arg types in place of va_list. |