diff options
| author | Earnie Boyd <earnie@users.sf.net> | 2012-08-03 20:18:27 +0400 |
|---|---|---|
| committer | Earnie Boyd <earnie@users.sf.net> | 2012-08-03 20:18:27 +0400 |
| commit | e5ac3c1375bb49a934702dbbf9ca0b9a593c8468 (patch) | |
| tree | 565c0c71e451917ba09da9336240a0e185f43271 | |
| parent | a8d0071db215b290e5a5f94133ee30e405fff216 (diff) | |
* include/stdio.h (_getws, _putws): Guard with #ifndef __STRICT_ANSI__.
(_wfdopen, _wfopen, _wfreopen, _wfsopen, _wtmpnam, _wtempnam): Ditto.
(_wrename, _wremove, _wperror, _wpopen): Ditto.
| -rw-r--r-- | winsup/mingw/ChangeLog | 3 | ||||
| -rw-r--r-- | winsup/mingw/include/stdio.h | 6 |
2 files changed, 7 insertions, 2 deletions
diff --git a/winsup/mingw/ChangeLog b/winsup/mingw/ChangeLog index a0a367d01..4ad7d5190 100644 --- a/winsup/mingw/ChangeLog +++ b/winsup/mingw/ChangeLog @@ -12,6 +12,9 @@ (_wcstrtoi64_l): Ditto. (_wcstrtoui64): Ditto. (_wcstrtoui64_l): Ditto. + * include/stdio.h (_getws, _putws): Guard with #ifndef __STRICT_ANSI__. + (_wfdopen, _wfopen, _wfreopen, _wfsopen, _wtmpnam, _wtempnam): Ditto. + (_wrename, _wremove, _wperror, _wpopen): Ditto. 2012-08-01 Earnie Boyd <earnie@users.sourceforge.net> diff --git a/winsup/mingw/include/stdio.h b/winsup/mingw/include/stdio.h index fe9f2b735..27dae0bc6 100644 --- a/winsup/mingw/include/stdio.h +++ b/winsup/mingw/include/stdio.h @@ -591,10 +591,11 @@ _CRTIMP wchar_t* __cdecl __MINGW_NOTHROW fgetws (wchar_t*, int, FILE*); _CRTIMP int __cdecl __MINGW_NOTHROW fputws (const wchar_t*, FILE*); _CRTIMP wint_t __cdecl __MINGW_NOTHROW getwc (FILE*); _CRTIMP wint_t __cdecl __MINGW_NOTHROW getwchar (void); -_CRTIMP wchar_t* __cdecl __MINGW_NOTHROW _getws (wchar_t*); _CRTIMP wint_t __cdecl __MINGW_NOTHROW putwc (wint_t, FILE*); -_CRTIMP int __cdecl __MINGW_NOTHROW _putws (const wchar_t*); _CRTIMP wint_t __cdecl __MINGW_NOTHROW putwchar (wint_t); +#ifndef __STRICT_ANSI__ +_CRTIMP wchar_t* __cdecl __MINGW_NOTHROW _getws (wchar_t*); +_CRTIMP int __cdecl __MINGW_NOTHROW _putws (const wchar_t*); _CRTIMP FILE* __cdecl __MINGW_NOTHROW _wfdopen(int, const wchar_t *); _CRTIMP FILE* __cdecl __MINGW_NOTHROW _wfopen (const wchar_t*, const wchar_t*); _CRTIMP FILE* __cdecl __MINGW_NOTHROW _wfreopen (const wchar_t*, const wchar_t*, FILE*); @@ -605,6 +606,7 @@ _CRTIMP int __cdecl __MINGW_NOTHROW _wrename (const wchar_t*, const wchar_t*); _CRTIMP int __cdecl __MINGW_NOTHROW _wremove (const wchar_t*); _CRTIMP void __cdecl __MINGW_NOTHROW _wperror (const wchar_t*); _CRTIMP FILE* __cdecl __MINGW_NOTHROW _wpopen (const wchar_t*, const wchar_t*); +#endif /* __STRING_ANSI__ */ #endif /* __MSVCRT__ */ #ifndef __NO_ISOCEXT /* externs in libmingwex.a */ |