From 413c5c85ca7279123136a308e51d0270857db518 Mon Sep 17 00:00:00 2001 From: Laurynas Biveinis Date: Thu, 14 Dec 2000 06:11:40 +0000 Subject: [PATCH] skip stdio_va_list fix if __DJ_va_list found in a header From-SVN: r38242 --- gcc/ChangeLog | 6 ++++++ gcc/fixinc/fixincl.x | 2 +- gcc/fixinc/inclhack.def | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 1cb2445655c..0208053fc73 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2000-12-13 Laurynas Biveinis + + * 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 * config.gcc (cygwin, win32, mingw32): Use float-i386.h. diff --git a/gcc/fixinc/fixincl.x b/gcc/fixinc/fixincl.x index 3203b678bf7..f64d29e4c7d 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 41ee2cda768..1c128a9d6c9 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. -- 2.30.2