diff options
| author | Danny Smith <dannysmith@users.sourceforge.net> | 2008-07-04 03:55:50 +0000 |
|---|---|---|
| committer | Danny Smith <dannysmith@users.sourceforge.net> | 2008-07-04 03:55:50 +0000 |
| commit | 608d5d8f36be59df14e05cca3e42f7eb8b3cf918 (patch) | |
| tree | 1177a1db4afcb53ccf63e729de09017c2125231d | |
| parent | 18a635e315d60f65d87a7ed590c3fea4fd4cc09c (diff) | |
| download | cygnal-608d5d8f36be59df14e05cca3e42f7eb8b3cf918.tar.gz cygnal-608d5d8f36be59df14e05cca3e42f7eb8b3cf918.tar.bz2 cygnal-608d5d8f36be59df14e05cca3e42f7eb8b3cf918.zip | |
* include/stdio.h (swprintf, vswprintf): Guard with #ifndef __STRICT_ANSI__
* include/wchar.h (swprintf, vswprintf): Likewise.
| -rw-r--r-- | winsup/mingw/ChangeLog | 6 | ||||
| -rw-r--r-- | winsup/mingw/include/stdio.h | 8 | ||||
| -rw-r--r-- | winsup/mingw/include/wchar.h | 8 |
3 files changed, 17 insertions, 5 deletions
diff --git a/winsup/mingw/ChangeLog b/winsup/mingw/ChangeLog index 983aadd2e..6c03c9b01 100644 --- a/winsup/mingw/ChangeLog +++ b/winsup/mingw/ChangeLog @@ -1,3 +1,8 @@ +2008-07-04 Danny Smith <dannysmith@users,sourceforge.net> + + * include/stdio.h (swprintf, vswprintf): Guard with #ifndef __STRICT_ANSI__ + * include/wchar.h (swprintf, vswprintf): Likewise. + 2008-07-01 Keith Marshall <keithmarshall@users.sourceforge.net> * msvcrt.def.in [__msvcr80__, __msvcr80d__, __msvcr90__, __msvcr90d__] @@ -8,7 +13,6 @@ (_TWO_DIGIT_EXPONENT): Define. Some other minor formatting adjustments. - 2008-06-14 Danny Smith <dannysmith@users.sourceforge.net> [mingw-Bugs-1801641] diff --git a/winsup/mingw/include/stdio.h b/winsup/mingw/include/stdio.h index f8bb0ec18..c01de5efd 100644 --- a/winsup/mingw/include/stdio.h +++ b/winsup/mingw/include/stdio.h @@ -447,11 +447,9 @@ __CRT_INLINE off64_t __cdecl __MINGW_NOTHROW ftello64 (FILE * stream) /* also in wchar.h - keep in sync */ _CRTIMP int __cdecl __MINGW_NOTHROW fwprintf (FILE*, const wchar_t*, ...); _CRTIMP int __cdecl __MINGW_NOTHROW wprintf (const wchar_t*, ...); -_CRTIMP int __cdecl __MINGW_NOTHROW swprintf (wchar_t*, const wchar_t*, ...); _CRTIMP int __cdecl __MINGW_NOTHROW _snwprintf (wchar_t*, size_t, const wchar_t*, ...); _CRTIMP int __cdecl __MINGW_NOTHROW vfwprintf (FILE*, const wchar_t*, __VALIST); _CRTIMP int __cdecl __MINGW_NOTHROW vwprintf (const wchar_t*, __VALIST); -_CRTIMP int __cdecl __MINGW_NOTHROW vswprintf (wchar_t*, const wchar_t*, __VALIST); _CRTIMP int __cdecl __MINGW_NOTHROW _vsnwprintf (wchar_t*, size_t, const wchar_t*, __VALIST); _CRTIMP int __cdecl __MINGW_NOTHROW fwscanf (FILE*, const wchar_t*, ...); _CRTIMP int __cdecl __MINGW_NOTHROW wscanf (const wchar_t*, ...); @@ -460,6 +458,12 @@ _CRTIMP wint_t __cdecl __MINGW_NOTHROW fgetwc (FILE*); _CRTIMP wint_t __cdecl __MINGW_NOTHROW fputwc (wchar_t, FILE*); _CRTIMP wint_t __cdecl __MINGW_NOTHROW ungetwc (wchar_t, FILE*); +/* These differ from the ISO C prototypes, which have a maxlen parameter (like snprintf). */ +#ifndef __STRICT_ANSI__ +_CRTIMP int __cdecl __MINGW_NOTHROW swprintf (wchar_t*, const wchar_t*, ...); +_CRTIMP int __cdecl __MINGW_NOTHROW vswprintf (wchar_t*, const wchar_t*, __VALIST); +#endif + #ifdef __MSVCRT__ _CRTIMP wchar_t* __cdecl __MINGW_NOTHROW fgetws (wchar_t*, int, FILE*); _CRTIMP int __cdecl __MINGW_NOTHROW fputws (const wchar_t*, FILE*); diff --git a/winsup/mingw/include/wchar.h b/winsup/mingw/include/wchar.h index d72527a1f..be769527b 100644 --- a/winsup/mingw/include/wchar.h +++ b/winsup/mingw/include/wchar.h @@ -102,11 +102,9 @@ struct tm { /* Also in stdio.h - keep in sync */ _CRTIMP int __cdecl __MINGW_NOTHROW fwprintf (FILE*, const wchar_t*, ...); _CRTIMP int __cdecl __MINGW_NOTHROW wprintf (const wchar_t*, ...); -_CRTIMP int __cdecl __MINGW_NOTHROW swprintf (wchar_t*, const wchar_t*, ...); _CRTIMP int __cdecl __MINGW_NOTHROW _snwprintf (wchar_t*, size_t, const wchar_t*, ...); _CRTIMP int __cdecl __MINGW_NOTHROW vfwprintf (FILE*, const wchar_t*, __VALIST); _CRTIMP int __cdecl __MINGW_NOTHROW vwprintf (const wchar_t*, __VALIST); -_CRTIMP int __cdecl __MINGW_NOTHROW vswprintf (wchar_t*, const wchar_t*, __VALIST); _CRTIMP int __cdecl __MINGW_NOTHROW _vsnwprintf (wchar_t*, size_t, const wchar_t*, __VALIST); _CRTIMP int __cdecl __MINGW_NOTHROW fwscanf (FILE*, const wchar_t*, ...); _CRTIMP int __cdecl __MINGW_NOTHROW wscanf (const wchar_t*, ...); @@ -115,6 +113,12 @@ _CRTIMP wint_t __cdecl __MINGW_NOTHROW fgetwc (FILE*); _CRTIMP wint_t __cdecl __MINGW_NOTHROW fputwc (wchar_t, FILE*); _CRTIMP wint_t __cdecl __MINGW_NOTHROW ungetwc (wchar_t, FILE*); +/* These differ from the ISO C prototypes, which have a maxlen parameter like snprintf. */ +#ifndef __STRICT_ANSI__ +_CRTIMP int __cdecl __MINGW_NOTHROW swprintf (wchar_t*, const wchar_t*, ...); +_CRTIMP int __cdecl __MINGW_NOTHROW vswprintf (wchar_t*, const wchar_t*, __VALIST); +#endif + #ifdef __MSVCRT__ _CRTIMP wchar_t* __cdecl __MINGW_NOTHROW fgetws (wchar_t*, int, FILE*); _CRTIMP int __cdecl __MINGW_NOTHROW fputws (const wchar_t*, FILE*); |