Unify names of used global functions.

diff --git a/stdio-common/asprintf.c b/stdio-common/asprintf.c
index bfc4d21..56c49de 100644 (file)
--- a/stdio-common/asprintf.c
+++ b/stdio-common/asprintf.c
@@ -19,6 +19,10 @@
 #include <stdarg.h>
 #include <stdio.h>
 
 #include <stdarg.h>
 #include <stdio.h>
 

+#ifdef USE_IN_LIBIO
+# define vasprintf(s, f, a) _IO_vasprintf (s, f, a)
+#endif
+

 /* Write formatted output from FORMAT to a string which is
    allocated with malloc and stored in *STRING_PTR.  */
 /* VARARGS2 */
 /* Write formatted output from FORMAT to a string which is
    allocated with malloc and stored in *STRING_PTR.  */
 /* VARARGS2 */

diff --git a/stdio-common/dprintf.c b/stdio-common/dprintf.c
index 0aa12d9..eddaea8 100644 (file)
--- a/stdio-common/dprintf.c
+++ b/stdio-common/dprintf.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1995, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1995, 1997, 1998 Free Software Foundation, Inc.

    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or


@@ -19,6 +19,10 @@
 #include <stdarg.h>
 #include <stdio.h>
 
 #include <stdarg.h>
 #include <stdio.h>
 

+#ifdef USE_IN_LIBIO
+# define vdprintf(d, f, a) _IO_vdprintf (d, f, a)
+#endif
+

 /* Write formatted output to D, according to the format string FORMAT.  */
 /* VARARGS2 */
 int
 /* Write formatted output to D, according to the format string FORMAT.  */
 /* VARARGS2 */
 int

diff --git a/stdio-common/getw.c b/stdio-common/getw.c
index a1629db..03da6c3 100644 (file)
--- a/stdio-common/getw.c
+++ b/stdio-common/getw.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1997, 1998 Free Software Foundation, Inc.

    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or


@@ -18,6 +18,9 @@
 
 #include <stdio.h>
 
 
 #include <stdio.h>
 

+#ifdef USE_IN_LIBIO
+# define fread(p, m, n, s) _IO_fread (p, m, n, s)
+#endif

 
 /* Read a word (int) from STREAM.  */
 int
 
 /* Read a word (int) from STREAM.  */
 int

diff --git a/stdio-common/putw.c b/stdio-common/putw.c
index c9d0d5d..31cc00f 100644 (file)
--- a/stdio-common/putw.c
+++ b/stdio-common/putw.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1997, 1998 Free Software Foundation, Inc.

    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or


@@ -18,6 +18,9 @@
 
 #include <stdio.h>
 
 
 #include <stdio.h>
 

+#ifdef USE_IN_LIBIO
+# define fwrite(p, n, m, s) _IO_fwrite (p, n, m, s)
+#endif

 
 /* Write the word (int) W to STREAM.  */
 int
 
 /* Write the word (int) W to STREAM.  */
 int

diff --git a/stdio-common/snprintf.c b/stdio-common/snprintf.c
index 3e6950d..08aaf88 100644 (file)
--- a/stdio-common/snprintf.c
+++ b/stdio-common/snprintf.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1995, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1995, 1997, 1998 Free Software Foundation, Inc.

    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or


@@ -19,6 +19,10 @@
 #include <stdarg.h>
 #include <stdio.h>
 
 #include <stdarg.h>
 #include <stdio.h>
 

+#ifdef USE_IN_LIBIO
+# define __vsnprintf(s, l, f, a) _IO_vsnprintf (s, l, f, a)
+#endif
+

 /* Write formatted output into S, according to the format
    string FORMAT, writing no more than MAXLEN characters.  */
 /* VARARGS3 */
 /* Write formatted output into S, according to the format
    string FORMAT, writing no more than MAXLEN characters.  */
 /* VARARGS3 */

diff --git a/stdio-common/sprintf.c b/stdio-common/sprintf.c
index 6ea1366..0a0259e 100644 (file)
--- a/stdio-common/sprintf.c
+++ b/stdio-common/sprintf.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1995, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1995, 1997, 1998 Free Software Foundation, Inc.

    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or


@@ -19,6 +19,10 @@
 #include <stdarg.h>
 #include <stdio.h>
 
 #include <stdarg.h>
 #include <stdio.h>
 

+#ifdef USE_IN_LIBIO
+# define vsprintf(s, f, a) _IO_vsprintf (s, f, a)
+#endif
+

 /* Write formatted output into S, according to the format string FORMAT.  */
 /* VARARGS2 */
 int
 /* Write formatted output into S, according to the format string FORMAT.  */
 /* VARARGS2 */
 int

diff --git a/stdio-common/sscanf.c b/stdio-common/sscanf.c
index c106152..809f059 100644 (file)
--- a/stdio-common/sscanf.c
+++ b/stdio-common/sscanf.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1995, 1996 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1995, 1996, 1998 Free Software Foundation, Inc.

    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or


@@ -19,6 +19,10 @@
 #include <stdarg.h>
 #include <stdio.h>
 
 #include <stdarg.h>
 #include <stdio.h>
 

+#ifdef USE_IN_LIBIO
+# define __vsscanf(s, f, a) _IO_vsscanf (s, f, a)
+#endif
+

 /* Read formatted input from S, according to the format string FORMAT.  */
 /* VARARGS2 */
 int
 /* Read formatted input from S, according to the format string FORMAT.  */
 /* VARARGS2 */
 int