skip stdio_va_list fix if __DJ_va_list found in a header

From-SVN: r38242

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 1cb2445655cbaea36517e53c7487258a8faa2ca7..0208053fc736394400247cd38aca04e9dfb13c0b 100644 (file)
--- 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 3203b678bf7831eef73c709dc61207c8db103310..f64d29e4c7d1b17effefd4882c1f09af8da5615a 100644 (file)
--- 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 41ee2cda7684f4d87edcc5499c8bb8ab35009b3a..1c128a9d6c97e6b17f17b56fcef4c8f5a47867e8 100644 (file)
--- 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.