diff options
Diffstat (limited to 'libio')
| -rw-r--r-- | libio/Makefile | 4 | ||||
| -rw-r--r-- | libio/bits/libio-ldbl.h | 27 | ||||
| -rw-r--r-- | libio/bits/stdio-ldbl.h | 70 | ||||
| -rw-r--r-- | libio/fwprintf.c | 6 | ||||
| -rw-r--r-- | libio/fwscanf.c | 6 | ||||
| -rw-r--r-- | libio/iovdprintf.c | 10 | ||||
| -rw-r--r-- | libio/iovsprintf.c | 14 | ||||
| -rw-r--r-- | libio/iovsscanf.c | 9 | ||||
| -rw-r--r-- | libio/iovswscanf.c | 11 | ||||
| -rw-r--r-- | libio/libio.h | 4 | ||||
| -rw-r--r-- | libio/libioP.h | 6 | ||||
| -rw-r--r-- | libio/obprintf.c | 10 | ||||
| -rw-r--r-- | libio/stdio.h | 3 | ||||
| -rw-r--r-- | libio/swprintf.c | 6 | ||||
| -rw-r--r-- | libio/swscanf.c | 7 | ||||
| -rw-r--r-- | libio/vasprintf.c | 7 | ||||
| -rw-r--r-- | libio/vscanf.c | 7 | ||||
| -rw-r--r-- | libio/vsnprintf.c | 9 | ||||
| -rw-r--r-- | libio/vswprintf.c | 8 | ||||
| -rw-r--r-- | libio/vwprintf.c | 9 | ||||
| -rw-r--r-- | libio/vwscanf.c | 7 | ||||
| -rw-r--r-- | libio/wprintf.c | 7 | ||||
| -rw-r--r-- | libio/wscanf.c | 7 |
23 files changed, 175 insertions, 79 deletions
diff --git a/libio/Makefile b/libio/Makefile index a97623f..5817bd7 100644 --- a/libio/Makefile +++ b/libio/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 1995-2002, 2003, 2004 Free Software Foundation, Inc. +# Copyright (C) 1995-2002,2003,2004,2006 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 @@ -22,7 +22,7 @@ subdir := libio headers := stdio.h libio.h _G_config.h bits/stdio.h bits/stdio-lock.h \ - bits/sys_errlist.h bits/stdio2.h + bits/sys_errlist.h bits/stdio2.h bits/stdio-ldbl.h bits/libio-ldbl.h routines := \ filedoalloc iofclose iofdopen iofflush iofgetpos iofgets iofopen \ diff --git a/libio/bits/libio-ldbl.h b/libio/bits/libio-ldbl.h new file mode 100644 index 0000000..6e02115 --- /dev/null +++ b/libio/bits/libio-ldbl.h @@ -0,0 +1,27 @@ +/* -mlong-double-64 compatibility mode for libio functions. + Copyright (C) 2006 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 + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +#ifndef _IO_STDIO_H +# error "Never include <bits/libio-ldbl.h> directly; use <libio.h> instead." +#endif + +__LDBL_REDIR_DECL (_IO_vfscanf) +__LDBL_REDIR_DECL (_IO_vfprintf) +__LDBL_REDIR_DECL (_IO_vfwscanf) +__LDBL_REDIR_DECL (_IO_vfwprintf) diff --git a/libio/bits/stdio-ldbl.h b/libio/bits/stdio-ldbl.h new file mode 100644 index 0000000..6324979 --- /dev/null +++ b/libio/bits/stdio-ldbl.h @@ -0,0 +1,70 @@ +/* -mlong-double-64 compatibility mode for stdio functions. + Copyright (C) 2006 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 + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +#ifndef _STDIO_H +# error "Never include <bits/stdio-ldbl.h> directly; use <stdio.h> instead." +#endif + +__BEGIN_NAMESPACE_STD +__LDBL_REDIR_DECL (fprintf) +__LDBL_REDIR_DECL (printf) +__LDBL_REDIR_DECL (sprintf) +__LDBL_REDIR_DECL (vfprintf) +__LDBL_REDIR_DECL (vprintf) +__LDBL_REDIR_DECL (vsprintf) +__LDBL_REDIR_DECL (fscanf) +__LDBL_REDIR_DECL (scanf) +__LDBL_REDIR_DECL (sscanf) +__END_NAMESPACE_STD + +#if defined __USE_BSD || defined __USE_ISOC99 || defined __USE_UNIX98 +__BEGIN_NAMESPACE_C99 +__LDBL_REDIR_DECL (snprintf) +__LDBL_REDIR_DECL (vsnprintf) +__END_NAMESPACE_C99 +#endif + +#ifdef __USE_ISOC99 +__BEGIN_NAMESPACE_C99 +__LDBL_REDIR_DECL (vfscanf) +__LDBL_REDIR_DECL (vsscanf) +__LDBL_REDIR_DECL (vscanf) +__END_NAMESPACE_C99 +#endif + +#ifdef __USE_GNU +__LDBL_REDIR_DECL (vdprintf) +__LDBL_REDIR_DECL (dprintf) +__LDBL_REDIR_DECL (vasprintf) +__LDBL_REDIR_DECL (__asprintf) +__LDBL_REDIR_DECL (asprintf) +__LDBL_REDIR_DECL (obstack_printf) +__LDBL_REDIR_DECL (obstack_vprintf) +#endif + +#if __USE_FORTIFY_LEVEL > 0 && !defined __cplusplus +__LDBL_REDIR_DECL (__sprintf_chk) +__LDBL_REDIR_DECL (__vsprintf_chk) +# if __USE_FORTIFY_LEVEL > 1 +__LDBL_REDIR_DECL (__fprintf_chk) +__LDBL_REDIR_DECL (__printf_chk) +__LDBL_REDIR_DECL (__vfprintf_chk) +__LDBL_REDIR_DECL (__vprintf_chk) +# endif +#endif diff --git a/libio/fwprintf.c b/libio/fwprintf.c index cadeda0..9d9111d 100644 --- a/libio/fwprintf.c +++ b/libio/fwprintf.c @@ -1,4 +1,5 @@ -/* Copyright (C) 1991, 1997, 1999, 2000, 2001 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1997, 1999, 2000, 2001, 2006 + 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 @@ -16,6 +17,7 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ +#include <libioP.h> #include <stdarg.h> #include <stdio.h> #include <wchar.h> @@ -35,4 +37,4 @@ __fwprintf (FILE *stream, const wchar_t *format, ...) return done; } -weak_alias (__fwprintf, fwprintf) +ldbl_weak_alias (__fwprintf, fwprintf) diff --git a/libio/fwscanf.c b/libio/fwscanf.c index 411e182..17296fa 100644 --- a/libio/fwscanf.c +++ b/libio/fwscanf.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1997, 1999, 2000 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1997, 1999, 2000, 2006 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 @@ -16,6 +16,7 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ +#include <libioP.h> #include <stdarg.h> #include <stdio.h> #include <wchar.h> @@ -23,7 +24,7 @@ /* Read formatted input from STREAM according to the format string FORMAT. */ /* VARARGS2 */ int -fwscanf (FILE *stream, const wchar_t *format, ...) +__fwscanf (FILE *stream, const wchar_t *format, ...) { va_list arg; int done; @@ -34,3 +35,4 @@ fwscanf (FILE *stream, const wchar_t *format, ...) return done; } +ldbl_strong_alias (__fwscanf, fwscanf) diff --git a/libio/iovdprintf.c b/libio/iovdprintf.c index e81d870..edab849 100644 --- a/libio/iovdprintf.c +++ b/libio/iovdprintf.c @@ -1,4 +1,5 @@ -/* Copyright (C) 1995,1997-2000,2001,2002,2003 Free Software Foundation, Inc. +/* Copyright (C) 1995, 1997-2000, 2001, 2002, 2003, 2006 + 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 @@ -25,7 +26,7 @@ This exception applies to code released by its copyright holders in files containing the exception. */ -#include "libioP.h" +#include <libioP.h> #include <stdio_ext.h> int @@ -63,7 +64,4 @@ _IO_vdprintf (d, format, arg) return done; } - -#ifdef weak_alias -weak_alias (_IO_vdprintf, vdprintf) -#endif +ldbl_weak_alias (_IO_vdprintf, vdprintf) diff --git a/libio/iovsprintf.c b/libio/iovsprintf.c index b26a99b..7fcd0a1 100644 --- a/libio/iovsprintf.c +++ b/libio/iovsprintf.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1993, 1997-2003 Free Software Foundation, Inc. +/* Copyright (C) 1993, 1997-2003, 2006 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 @@ -29,10 +29,7 @@ #include "strfile.h" int -_IO_vsprintf (string, format, args) - char *string; - const char *format; - _IO_va_list args; +__IO_vsprintf (char *string, const char *format, _IO_va_list args) { _IO_strfile sf; int ret; @@ -47,8 +44,7 @@ _IO_vsprintf (string, format, args) _IO_putc_unlocked ('\0', (_IO_FILE *) &sf._sbf); return ret; } -INTDEF(_IO_vsprintf) +INTDEF2(__IO_vsprintf, _IO_vsprintf) -#ifdef weak_alias -weak_alias (_IO_vsprintf, vsprintf) -#endif +ldbl_strong_alias (__IO_vsprintf, _IO_vsprintf) +ldbl_weak_alias (__IO_vsprintf, vsprintf) diff --git a/libio/iovsscanf.c b/libio/iovsscanf.c index 1a965c2..10e4b0a 100644 --- a/libio/iovsscanf.c +++ b/libio/iovsscanf.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1993, 1997-2003 Free Software Foundation, Inc. +/* Copyright (C) 1993, 1997-2003, 2006 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 @@ -45,8 +45,5 @@ _IO_vsscanf (string, format, args) ret = INTUSE(_IO_vfscanf) ((_IO_FILE *) &sf._sbf, format, args, NULL); return ret; } - -#ifdef weak_alias -weak_alias (_IO_vsscanf, __vsscanf) -weak_alias (_IO_vsscanf, vsscanf) -#endif +ldbl_weak_alias (_IO_vsscanf, __vsscanf) +ldbl_weak_alias (_IO_vsscanf, vsscanf) diff --git a/libio/iovswscanf.c b/libio/iovswscanf.c index 1bbddd4..182d8da 100644 --- a/libio/iovswscanf.c +++ b/libio/iovswscanf.c @@ -1,4 +1,5 @@ -/* Copyright (C) 1993, 1997-2000, 2001, 2002 Free Software Foundation, Inc. +/* Copyright (C) 1993, 1997-2000, 2001, 2002, 2006 + 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 @@ -30,10 +31,7 @@ #include <wchar.h> int -vswscanf (string, format, args) - const wchar_t *string; - const wchar_t *format; - _IO_va_list args; +__vswscanf (const wchar_t *string, const wchar_t *format, _IO_va_list args) { int ret; _IO_strfile sf; @@ -47,4 +45,5 @@ vswscanf (string, format, args) ret = _IO_vfwscanf ((_IO_FILE *) &sf._sbf, format, args, NULL); return ret; } -libc_hidden_def (vswscanf) +ldbl_hidden_def (__vswscanf, vswscanf) +ldbl_strong_alias (__vswscanf, vswscanf) diff --git a/libio/libio.h b/libio/libio.h index 36d1b3c..6f9c418 100644 --- a/libio/libio.h +++ b/libio/libio.h @@ -534,6 +534,10 @@ extern _IO_ssize_t _IO_wpadn (_IO_FILE *, wint_t, _IO_ssize_t) __THROW; extern void _IO_free_wbackup_area (_IO_FILE *) __THROW; #endif +#ifdef __LDBL_COMPAT +# include <bits/libio-ldbl.h> +#endif + #ifdef __cplusplus } #endif diff --git a/libio/libioP.h b/libio/libioP.h index 3723d04..a2cd4c2 100644 --- a/libio/libioP.h +++ b/libio/libioP.h @@ -1,5 +1,5 @@ -/* Copyright (C) 1993, 1997-2003, 2004, 2005, 2006 - Free Software Foundation, Inc. +/* Copyright (C) 1993, 1997-2003,2004,2005,2006 + 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 @@ -36,6 +36,8 @@ /*# include <comthread.h>*/ #endif +#include <math_ldbl_opt.h> + #include "iolibio.h" /* Control of exported symbols. Used in glibc. By default we don't diff --git a/libio/obprintf.c b/libio/obprintf.c index 1167a93..0a50c8e 100644 --- a/libio/obprintf.c +++ b/libio/obprintf.c @@ -1,5 +1,5 @@ /* Print output of stream to given obstack. - Copyright (C) 1996,1997,1999,2000,2001,2002,2003,2004,2005 + Copyright (C) 1996,1997,1999,2000,2001,2002,2003,2004,2005,2006 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996. @@ -176,9 +176,7 @@ _IO_obstack_vprintf (struct obstack *obstack, const char *format, va_list args) return result; } -#ifdef weak_alias -weak_alias (_IO_obstack_vprintf, obstack_vprintf) -#endif +ldbl_weak_alias (_IO_obstack_vprintf, obstack_vprintf) int @@ -191,6 +189,4 @@ _IO_obstack_printf (struct obstack *obstack, const char *format, ...) va_end (ap); return result; } -#ifdef weak_alias -weak_alias (_IO_obstack_printf, obstack_printf) -#endif +ldbl_weak_alias (_IO_obstack_printf, obstack_printf) diff --git a/libio/stdio.h b/libio/stdio.h index baba806..fbe0f56 100644 --- a/libio/stdio.h +++ b/libio/stdio.h @@ -836,6 +836,9 @@ extern void funlockfile (FILE *__stream) __THROW; #if __USE_FORTIFY_LEVEL > 0 && !defined __cplusplus # include <bits/stdio2.h> #endif +#ifdef __LDBL_COMPAT +# include <bits/stdio-ldbl.h> +#endif __END_DECLS diff --git a/libio/swprintf.c b/libio/swprintf.c index 298c1e7..ea0bdfd 100644 --- a/libio/swprintf.c +++ b/libio/swprintf.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991,1995,1997,1998,1999,2000,2003 +/* Copyright (C) 1991,1995,1997,1998,1999,2000,2003,2004,2006 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -17,13 +17,14 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ +#include <libioP.h> #include <stdarg.h> #include <wchar.h> /* Write formatted output into S, according to the format string FORMAT. */ /* VARARGS3 */ int -swprintf (wchar_t *s, size_t n, const wchar_t *format, ...) +__swprintf (wchar_t *s, size_t n, const wchar_t *format, ...) { va_list arg; int done; @@ -34,3 +35,4 @@ swprintf (wchar_t *s, size_t n, const wchar_t *format, ...) return done; } +ldbl_strong_alias (__swprintf, swprintf) diff --git a/libio/swscanf.c b/libio/swscanf.c index c837ad1..f93d207 100644 --- a/libio/swscanf.c +++ b/libio/swscanf.c @@ -1,4 +1,5 @@ -/* Copyright (C) 1991,1995,1996,1998,1999,2003 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1995, 1996, 1998, 1999, 2003, 2006 + 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 @@ -16,13 +17,14 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ +#include <libioP.h> #include <stdarg.h> #include <wchar.h> /* Read formatted input from S, according to the format string FORMAT. */ /* VARARGS2 */ int -swscanf (const wchar_t *s, const wchar_t *format, ...) +__swscanf (const wchar_t *s, const wchar_t *format, ...) { va_list arg; int done; @@ -33,3 +35,4 @@ swscanf (const wchar_t *s, const wchar_t *format, ...) return done; } +ldbl_strong_alias (__swscanf, swscanf) diff --git a/libio/vasprintf.c b/libio/vasprintf.c index e32a488..ac77330 100644 --- a/libio/vasprintf.c +++ b/libio/vasprintf.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1995,1997,1999-2002,2004 Free Software Foundation, Inc. +/* Copyright (C) 1995,1997,1999-2002,2004,2006 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 @@ -87,7 +87,4 @@ _IO_vasprintf (result_ptr, format, args) (*result_ptr)[needed - 1] = '\0'; return ret; } - -#ifdef weak_alias -weak_alias (_IO_vasprintf, vasprintf) -#endif +ldbl_weak_alias (_IO_vasprintf, vasprintf) diff --git a/libio/vscanf.c b/libio/vscanf.c index 477cbae..78c30ee 100644 --- a/libio/vscanf.c +++ b/libio/vscanf.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1993, 1997, 2002 Free Software Foundation, Inc. +/* Copyright (C) 1993, 1997, 2002, 2006 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 @@ -37,7 +37,4 @@ _IO_vscanf (format, args) { return INTUSE(_IO_vfscanf) (_IO_stdin, format, args, NULL); } - -#ifdef weak_alias -weak_alias (_IO_vscanf, vscanf) -#endif +ldbl_weak_alias (_IO_vscanf, vscanf) diff --git a/libio/vsnprintf.c b/libio/vsnprintf.c index 4250c2d..289160e 100644 --- a/libio/vsnprintf.c +++ b/libio/vsnprintf.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1994,1997,1999-2003, 2004 Free Software Foundation, Inc. +/* Copyright (C) 1994,1997,1999-2003, 2004, 2006 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 @@ -123,8 +123,5 @@ _IO_vsnprintf (string, maxlen, format, args) *sf.f._sbf._f._IO_write_ptr = '\0'; return ret; } - -#ifdef weak_alias -weak_alias (_IO_vsnprintf, __vsnprintf) -weak_alias (_IO_vsnprintf, vsnprintf) -#endif +ldbl_weak_alias (_IO_vsnprintf, __vsnprintf) +ldbl_weak_alias (_IO_vsnprintf, vsnprintf) diff --git a/libio/vswprintf.c b/libio/vswprintf.c index eda8495..5bbd202 100644 --- a/libio/vswprintf.c +++ b/libio/vswprintf.c @@ -1,4 +1,5 @@ -/* Copyright (C) 1994,1997,1999-2002,2004,2005 Free Software Foundation, Inc. +/* Copyright (C) 1994, 1997, 1999-2002, 2004, 2005, 2006 + 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 @@ -126,8 +127,5 @@ _IO_vswprintf (string, maxlen, format, args) return ret; } - -#ifdef weak_alias weak_alias (_IO_vswprintf, __vswprintf) -weak_alias (_IO_vswprintf, vswprintf) -#endif +ldbl_weak_alias (_IO_vswprintf, vswprintf) diff --git a/libio/vwprintf.c b/libio/vwprintf.c index 814fdf3..bd9a950 100644 --- a/libio/vwprintf.c +++ b/libio/vwprintf.c @@ -1,4 +1,5 @@ -/* Copyright (C) 1991,1993,1995,1997,1999,2001 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1993, 1995, 1997, 1999, 2001, 2006 + 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 @@ -16,6 +17,7 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ +#include <libioP.h> #include <stdarg.h> #include <stdio.h> #include <wchar.h> @@ -23,9 +25,8 @@ /* Write formatted output to stdout according to the format string FORMAT, using the argument list in ARG. */ int -vwprintf (format, arg) - const wchar_t *format; - __gnuc_va_list arg; +__vwprintf (const wchar_t *format, __gnuc_va_list arg) { return __vfwprintf (stdout, format, arg); } +ldbl_strong_alias (__vwprintf, vwprintf) diff --git a/libio/vwscanf.c b/libio/vwscanf.c index cd7af9c..f6d04e8 100644 --- a/libio/vwscanf.c +++ b/libio/vwscanf.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1993, 1997, 1999 Free Software Foundation, Inc. +/* Copyright (C) 1993, 1997, 1999, 2006 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 @@ -29,9 +29,8 @@ #include <wchar.h> int -vwscanf (format, args) - const wchar_t *format; - _IO_va_list args; +__vwscanf (const wchar_t *format, _IO_va_list args) { return _IO_vfwscanf (_IO_stdin, format, args, NULL); } +ldbl_strong_alias (__vwscanf, vwscanf) diff --git a/libio/wprintf.c b/libio/wprintf.c index f418cf5..d06451c 100644 --- a/libio/wprintf.c +++ b/libio/wprintf.c @@ -1,4 +1,5 @@ -/* Copyright (C) 1991,1995,1996,1997,1999,2001 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1995, 1996, 1997, 1999, 2001, 2006 + 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 @@ -16,6 +17,7 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ +#include <libioP.h> #include <stdarg.h> #include <stdio.h> #include <wchar.h> @@ -23,7 +25,7 @@ /* Write formatted output to stdout from the format string FORMAT. */ /* VARARGS1 */ int -wprintf (const wchar_t *format, ...) +__wprintf (const wchar_t *format, ...) { va_list arg; int done; @@ -34,3 +36,4 @@ wprintf (const wchar_t *format, ...) return done; } +ldbl_strong_alias (__wprintf, wprintf) diff --git a/libio/wscanf.c b/libio/wscanf.c index f4b8cd1..3eba620 100644 --- a/libio/wscanf.c +++ b/libio/wscanf.c @@ -1,4 +1,5 @@ -/* Copyright (C) 1991, 1995, 1996, 1997, 1999 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1995, 1996, 1997, 1999, 2006 + 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 @@ -16,6 +17,7 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ +#include <libioP.h> #include <stdarg.h> #include <stdio.h> #include <wchar.h> @@ -24,7 +26,7 @@ /* Read formatted input from stdin according to the format string FORMAT. */ /* VARARGS1 */ int -wscanf (const wchar_t *format, ...) +__wscanf (const wchar_t *format, ...) { va_list arg; int done; @@ -35,3 +37,4 @@ wscanf (const wchar_t *format, ...) return done; } +ldbl_strong_alias (__wscanf, wscanf) |