merge from gcc

[external/binutils.git] / gas / input-file.h

diff --git a/gas/input-file.h b/gas/input-file.h
index edd9c54..716f2a6 100644 (file)
--- a/gas/input-file.h
+++ b/gas/input-file.h
@@ -1,11 +1,12 @@
 /* input_file.h header for input-file.c
-   Copyright (C) 1987, 1992 Free Software Foundation, Inc.
+   Copyright 1987, 1992, 1993, 2000, 2003, 2005, 2006, 2007
+   Free Software Foundation, Inc.
 
    This file is part of GAS, the GNU Assembler.
 
    GAS 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)
+   the Free Software Foundation; either version 3, or (at your option)
    any later version.
 
    GAS is distributed in the hope that it will be useful,
@@ -14,12 +15,12 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with GAS; see the file COPYING.  If not, write to
-   the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+   along with GAS; see the file COPYING.  If not, write to the Free
+   Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA
+   02110-1301, USA.  */
 
 /*"input_file.c":Operating-system dependant functions to read source files.*/
 
-
 /*
  * No matter what the operating system, this module must provide the
  * following services to its callers.
@@ -51,34 +52,15 @@
  *
  * input_file_close ()                 Closes opened file.
  *
- * All errors are reported (using as_perror) so caller doesn't have to think
- * about I/O errors. No I/O errors are fatal: an end-of-file may be faked.
+ * All errors are reported so caller doesn't have to think
+ * about I/O errors.
  */
 
-#if __STDC__ == 1
-
 char *input_file_give_next_buffer (char *where);
 char *input_file_push (void);
-int input_file_buffer_size (void);
-int input_file_is_open (void);
+unsigned int input_file_buffer_size (void);
 void input_file_begin (void);
 void input_file_close (void);
 void input_file_end (void);
 void input_file_open (char *filename, int pre);
 void input_file_pop (char *arg);
-
-#else /* not __STDC__ */
-
-char *input_file_give_next_buffer ();
-char *input_file_push ();
-int input_file_buffer_size ();
-int input_file_is_open ();
-void input_file_begin ();
-void input_file_close ();
-void input_file_end ();
-void input_file_open ();
-void input_file_pop ();
-
-#endif /* not __STDC__ */
-
-/* end of input_file.h */