* gcc.dg/graphite/pr38409.c: Fixed commit problem.

[pf3gnuchains/gcc-fork.git] / gcc / fix-header.c

diff --git a/gcc/fix-header.c b/gcc/fix-header.c
index 4e4c8dc..5402e94 100644 (file)
--- a/gcc/fix-header.c
+++ b/gcc/fix-header.c
@@ -1,20 +1,20 @@
 /* fix-header.c - Make C header file suitable for C++.
-   Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998,
-   1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+   2002, 2003, 2004, 2006, 2007  Free Software Foundation, Inc.
 
-This program is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published by the
+   Free Software Foundation; either version 3, or (at your option) any
+   later version.
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING3.  If not see
+   <http://www.gnu.org/licenses/>.  */
 
 /* This program massages a system include file (such as stdio.h),
    into a form that is compatible with GNU C and GNU C++.
@@ -78,21 +78,23 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include "obstack.h"
 #include "scan.h"
 #include "cpplib.h"
-#include "c-incpath.h"
+#include "incpath.h"
 #include "errors.h"
 
 #ifdef TARGET_EXTRA_INCLUDES
-void TARGET_EXTRA_INCLUDES (const char *sysroot ATTRIBUTE_UNUSED,
-                           const char *iprefix ATTRIBUTE_UNUSED,
-                           int stdinc ATTRIBUTE_UNUSED)
+void
+TARGET_EXTRA_INCLUDES (const char *sysroot ATTRIBUTE_UNUSED,
+                      const char *iprefix ATTRIBUTE_UNUSED,
+                      int stdinc ATTRIBUTE_UNUSED)
 {
 }
 #endif
 
 #ifdef TARGET_EXTRA_PRE_INCLUDES 
-void TARGET_EXTRA_PRE_INCLUDES (const char *sysroot ATTRIBUTE_UNUSED,
-                           const char *iprefix ATTRIBUTE_UNUSED,
-                           int stdinc ATTRIBUTE_UNUSED)
+void
+TARGET_EXTRA_PRE_INCLUDES (const char *sysroot ATTRIBUTE_UNUSED,
+                          const char *iprefix ATTRIBUTE_UNUSED,
+                          int stdinc ATTRIBUTE_UNUSED)
 {
 }
 #endif
@@ -560,7 +562,10 @@ recognized_function (const cpp_token *fname, unsigned int line, int kind,
   /* We only have a partial function declaration,
      so remember that we have to add a complete prototype.  */
   partial_count++;
-  partial = obstack_alloc (&scan_file_obstack, sizeof (struct partial_proto));
+  partial
+    = (struct partial_proto *)
+      obstack_alloc (&scan_file_obstack,
+                    sizeof (struct partial_proto));
   partial->line_seen = line;
   partial->fn = fn;
   fn->partial = partial;
@@ -666,8 +671,8 @@ read_scan_file (char *in_fname, int argc, char **argv)
     exit (FATAL_EXIT_CODE);
 
   register_include_chains (scan_in, NULL /* sysroot */, NULL /* iprefix */,
-                          true /* stdinc */, false /* cxx_stdinc */,
-                          false /* verbose */);
+                          NULL /* imultilib */, true /* stdinc */,
+                          false /* cxx_stdinc */, false /* verbose */);
 
   /* We are scanning a system header, so mark it as such.  */
   cpp_make_system_header (scan_in, 1, 0);
@@ -1187,7 +1192,7 @@ main (int argc, char **argv)
       exit (FATAL_EXIT_CODE);
     }
   inf_size = sbuf.st_size;
-  inf_buffer = xmalloc (inf_size + 2);
+  inf_buffer = XNEWVEC (char, inf_size + 2);
   inf_ptr = inf_buffer;
 
   to_read = inf_size;