diff options
Diffstat (limited to 'wcsmbs')
| -rw-r--r-- | wcsmbs/Makefile | 5 | ||||
| -rw-r--r-- | wcsmbs/bits/wchar-ldbl.h | 60 | ||||
| -rw-r--r-- | wcsmbs/bits/wchar2.h | 19 | ||||
| -rw-r--r-- | wcsmbs/wchar.h | 11 |
4 files changed, 74 insertions, 21 deletions
diff --git a/wcsmbs/Makefile b/wcsmbs/Makefile index 7446bda89e..7a289a8dc7 100644 --- a/wcsmbs/Makefile +++ b/wcsmbs/Makefile @@ -1,4 +1,5 @@ -# Copyright (C) 1995-2000,2002,2003,2004,2005 Free Software Foundation, Inc. +# Copyright (C) 1995-2000,2002,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 @@ -21,7 +22,7 @@ # subdir := wcsmbs -headers := wchar.h bits/wchar.h bits/wchar2.h +headers := wchar.h bits/wchar.h bits/wchar2.h bits/wchar-ldbl.h distribute := wcwidth.h wcsmbsload.h routines := wcscat wcschr wcscmp wcscpy wcscspn wcsdup wcslen wcsncat \ diff --git a/wcsmbs/bits/wchar-ldbl.h b/wcsmbs/bits/wchar-ldbl.h new file mode 100644 index 0000000000..ac5d3b1c89 --- /dev/null +++ b/wcsmbs/bits/wchar-ldbl.h @@ -0,0 +1,60 @@ +/* -mlong-double-64 compatibility mode for <wchar.h> 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 _WCHAR_H +# error "Never include <bits/wchar-ldbl.h> directly; use <wchar.h> instead." +#endif + +#if defined __LDBL_COMPAT && defined __GNUC__ && __GNUC__ >= 2 + +# define __LDBL_REDIR_WCHAR(name) \ + extern __typeof (name) name __asm (__ASMNAME (__nldbl_##name)) + +# if defined __USE_ISOC99 || defined __USE_UNIX98 +__BEGIN_NAMESPACE_C99 +__LDBL_REDIR_WCHAR (fwprintf); +__LDBL_REDIR_WCHAR (wprintf); +__LDBL_REDIR_WCHAR (swprintf); +__LDBL_REDIR_WCHAR (vfwprintf); +__LDBL_REDIR_WCHAR (vwprintf); +__LDBL_REDIR_WCHAR (vswprintf); +__LDBL_REDIR_WCHAR (fwscanf); +__LDBL_REDIR_WCHAR (wscanf); +__LDBL_REDIR_WCHAR (swscanf); +__END_NAMESPACE_C99 +# endif + +# ifdef __USE_ISOC99 +__BEGIN_NAMESPACE_C99 +__LDBL_REDIR_WCHAR (vfwscanf); +__LDBL_REDIR_WCHAR (vwscanf); +__LDBL_REDIR_WCHAR (vswscanf); +__END_NAMESPACE_C99 +# endif + +#if __USE_FORTIFY_LEVEL > 0 && !defined __cplusplus +__LDBL_REDIR_DECL (__swprintf_chk) +__LDBL_REDIR_DECL (__vswprintf_chk) +# if __USE_FORTIFY_LEVEL > 1 +__LDBL_REDIR_DECL (__fwprintf_chk) +__LDBL_REDIR_DECL (__wprintf_chk) +__LDBL_REDIR_DECL (__vfwprintf_chk) +__LDBL_REDIR_DECL (__vwprintf_chk) +# endif +#endif diff --git a/wcsmbs/bits/wchar2.h b/wcsmbs/bits/wchar2.h index 00fd8776f5..00216ec059 100644 --- a/wcsmbs/bits/wchar2.h +++ b/wcsmbs/bits/wchar2.h @@ -210,22 +210,11 @@ extern int __vswprintf_chk (wchar_t *__restrict __s, size_t __n, __const wchar_t *__restrict __format, __gnuc_va_list __arg) __THROW /* __attribute__ ((__format__ (__wprintf__, 5, 0))) */; -extern int __REDIRECT_NTH (__vswprintf_alias, - (wchar_t *__restrict __s, size_t __n, - __const wchar_t *__restrict __format, - __gnuc_va_list __arg), vswprintf) - /* __attribute__ ((__format__ (__wprintf__, 3, 0))) */; - -extern __always_inline int -__NTH (vswprintf (wchar_t *__s, size_t __n, __const wchar_t *__format, - __gnuc_va_list __arg)) -{ - if (__bos (__s) != (size_t) -1 || __USE_FORTIFY_LEVEL > 1) - return __vswprintf_chk (__s, __n, __USE_FORTIFY_LEVEL - 1, __bos (__s), - __format, __arg); - return __vswprintf_alias (__s, __n, __format, __arg); -} +#define vswprintf(s, n, fmt, ap) \ + (__bos (s) != (size_t) -1 || __USE_FORTIFY_LEVEL > 1 \ + ? __vswprintf_chk (s, n, __USE_FORTIFY_LEVEL - 1, __bos (s), fmt, ap) \ + : vswprintf (s, n, fmt, ap)) #if __USE_FORTIFY_LEVEL > 1 diff --git a/wcsmbs/wchar.h b/wcsmbs/wchar.h index 0c02dcc574..fb7a641db7 100644 --- a/wcsmbs/wchar.h +++ b/wcsmbs/wchar.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1995-2004, 2005 Free Software Foundation, Inc. +/* Copyright (C) 1995-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 @@ -562,11 +562,11 @@ __NTH (wcstof (__const wchar_t *__restrict __nptr, wchar_t **__restrict __endptr)) { return __wcstof_internal (__nptr, __endptr, 0); } extern __inline long double +# ifndef __LDBL_COMPAT __NTH (wcstold (__const wchar_t *__restrict __nptr, wchar_t **__restrict __endptr)) { return __wcstold_internal (__nptr, __endptr, 0); } - - +# endif __extension__ extern __inline long long int __NTH (wcstoq (__const wchar_t *__restrict __nptr, @@ -834,12 +834,15 @@ extern size_t wcsftime_l (wchar_t *__restrict __s, size_t __maxsize, #endif +#ifdef __LDBL_COMPAT +# include <bits/wchar-ldbl.h> +#endif + /* Define some macros helping to catch buffer overflows. */ #if __USE_FORTIFY_LEVEL > 0 && !defined __cplusplus # include <bits/wchar2.h> #endif - __END_DECLS #endif /* _WCHAR_H defined */ |