* collect2.c (main, write_c_file_stat), gcc.c (translate_options,

[pf3gnuchains/gcc-fork.git] / libio / iovfprintf.c

diff --git a/libio/iovfprintf.c b/libio/iovfprintf.c
index c41cbbf..229215a 100644 (file)
--- a/libio/iovfprintf.c
+++ b/libio/iovfprintf.c
@@ -26,17 +26,30 @@ the executable file might be covered by the GNU General Public License. */
  * Copyright (c) 1990 Regents of the University of California.
  * All rights reserved.
  *
- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. [rescinded 22 July 1999]
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
  */
 
 
@@ -84,8 +97,9 @@ struct helper_file
 };
 
 static int
-DEFUN(_IO_helper_overflow, (fp, c),
-      _IO_FILE *fp AND int c)
+_IO_helper_overflow (fp, c)
+     _IO_FILE *fp;
+     int c;
 {
   _IO_FILE *target = ((struct helper_file*)fp)->_put_stream;
   int used = fp->_IO_write_ptr - fp->_IO_write_base;
@@ -119,8 +133,10 @@ static struct _IO_jump_t _IO_helper_jumps = {
 };
 
 static int
-DEFUN(helper_vfprintf, (fp, fmt0, ap),
-      register _IO_FILE* fp AND char const *fmt0 AND _IO_va_list ap)
+helper_vfprintf (fp, fmt0, ap)
+     _IO_FILE *fp;
+     char const *fmt0;
+     _IO_va_list ap;
 {
   char buf[_IO_BUFSIZ];
   struct helper_file helper;
@@ -180,8 +196,10 @@ extern double modf __P((double, double*));
 #define        HEXPREFIX       0x40            /* add 0x or 0X prefix */
 
 int
-DEFUN(_IO_vfprintf, (fp, fmt0, ap),
-      register _IO_FILE* fp AND char const *fmt0 AND _IO_va_list ap)
+_IO_vfprintf (fp, fmt0, ap)
+     _IO_FILE *fp;
+     char const *fmt0;
+     _IO_va_list ap;
 {
        register const char *fmt; /* format string */
        register int ch;        /* character from fmt */