Apply some more rigorous __STRICT_ANSI__ filtering.

diff --git a/mingwrt/ChangeLog b/mingwrt/ChangeLog
index 901cf49..f36c4ca 100644 (file)
--- a/mingwrt/ChangeLog
+++ b/mingwrt/ChangeLog
@@ -1,5 +1,14 @@
 2012-08-02  Earnie Boyd  <earnie@users.sourceforge.net>
 
+       Apply some more rigorous __STRICT_ANSI__ filtering.
+
+       * include/stdio.h (_getws, _putws, _wfdopen, _wfopen) 
+       (_wfreopen, _wfsopen, _wtmpnam, _wtempnam, _wrename, _wremove)
+       (_wperror, _wpopen): Do not declare these functions unless...
+       [#ifndef __STRICT_ANSI__]: ...this is satisfied.
+
+2012-08-02  Earnie Boyd  <earnie@users.sourceforge.net>
+
        Add string to 64-bit integer conversion function prototypes.
 
        * include/stdlib.h (_strtoi64, _strtoi64_l, _strtoui64, _strtoui64_l)

diff --git a/mingwrt/include/stdio.h b/mingwrt/include/stdio.h
index a6ec37e..07d5ea0 100644 (file)
--- a/mingwrt/include/stdio.h
+++ b/mingwrt/include/stdio.h
@@ -591,10 +591,12 @@ _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 +607,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  /* __STRICT_ANSI__ */
 #endif /* __MSVCRT__ */
 
 #ifndef __NO_ISOCEXT  /* externs in libmingwex.a */