* include/stdio.h: Qualify another size_t with __CSTD.

	* include/stdlib.h: Likewise.
	* include/wchar.h: Qualify size_t with __CSTD,
	when in global namespace.

4 files changed, 21 insertions, 14 deletions

diff --git a/winsup/mingw/ChangeLog b/winsup/mingw/ChangeLog
index 6a6812bbf38..309182c3d01 100644
--- a/winsup/mingw/ChangeLog
+++ b/winsup/mingw/ChangeLog
@@ -1,8 +1,15 @@
+2002-10-16  Danny Smith  <dannysmith@users.sourceforge.net>
+
+	* include/stdio.h: Qualify another size_t with __CSTD.
+	* include/stdlib.h: Likewise.
+	* include/wchar.h: Qualify size_t with __CSTD,
+	when in global namespace.
+
 2002-10-11  Danny Smith  <dannysmith@users.sourceforge.net>
 
-	* include/ctype: Qualify wint_t with __CSTD
+	* include/ctype.h: Qualify wint_t with __CSTD
 	when in global namespace.
-	* include/wctype:Likewise.
+	* include/wctype.h:Likewise.
 	* include/stdio.h: Qualify wint_t and size_t with __CSTD
 	when in global namespace.
 	* include/stdlib.h: Qualify size_t with __CSTD
diff --git a/winsup/mingw/include/stdio.h b/winsup/mingw/include/stdio.h
index bc35a0fda81..5390d36c5d8 100644
--- a/winsup/mingw/include/stdio.h
+++ b/winsup/mingw/include/stdio.h
@@ -378,7 +378,7 @@ __CSTD FILE* _wpopen (const wchar_t*, const wchar_t*);
 
 /* C99 names, but non-standard behaviour */
 int	_snwprintf (wchar_t*, __CSTD size_t, const wchar_t*, ...);
-int	_vsnwprintf (wchar_t*, size_t, const wchar_t*, __VALIST);
+int	_vsnwprintf (wchar_t*, __CSTD size_t, const wchar_t*, __VALIST);
 #ifndef __NO_ISOCEXT  /* externs in libmingwex.a */
 int snwprintf(wchar_t* s, __CSTD size_t n, const wchar_t*  format, ...);
 extern __inline__ int
diff --git a/winsup/mingw/include/stdlib.h b/winsup/mingw/include/stdlib.h
index 4734fd87b09..ae88e8375a0 100644
--- a/winsup/mingw/include/stdlib.h
+++ b/winsup/mingw/include/stdlib.h
@@ -422,7 +422,7 @@ char*	_gcvt (double, int, char*);
 
 void	_makepath (char*, const char*, const char*, const char*, const char*);
 void	_splitpath (const char*, char*, char*, char*, char*);
-char*	_fullpath (char*, const char*, size_t);
+char*	_fullpath (char*, const char*, __CSTD size_t);
 
 
 char*	_itoa (int, char*, int);
diff --git a/winsup/mingw/include/wchar.h b/winsup/mingw/include/wchar.h
index b09110c0000..bf493bc1976 100644
--- a/winsup/mingw/include/wchar.h
+++ b/winsup/mingw/include/wchar.h
@@ -145,12 +145,12 @@ __CSTD FILE*	_wpopen (const wchar_t*, const wchar_t*);
 #endif	/* __MSVCRT__ */
 
 /* C99 names, but non-standard behaviour */
-int	_snwprintf (wchar_t*, size_t, const wchar_t*, ...);
-int	_vsnwprintf (wchar_t*, size_t, const wchar_t*, __VALIST);
+int	_snwprintf (wchar_t*, __CSTD size_t, const wchar_t*, ...);
+int	_vsnwprintf (wchar_t*, __CSTD size_t, const wchar_t*, __VALIST);
 #ifndef __NO_ISOCEXT  /* externs in libmingwex.a */
-int snwprintf(wchar_t* s, size_t n, const wchar_t*  format, ...);
+int snwprintf(wchar_t* s, __CSTD size_t n, const wchar_t*  format, ...);
 extern __inline__ int
-vsnwprintf (wchar_t* __s, size_t __n, const wchar_t* __format,
+vsnwprintf (wchar_t* __s, __CSTD size_t __n, const wchar_t* __format,
 	    __VALIST __arg)
   { return _vsnwprintf ( __s, __n, __format, __arg);}
 #endif
@@ -197,15 +197,15 @@ wchar_t* _wcsdup (const wchar_t*);
 int	_wcsicmp (const wchar_t*, const wchar_t*);
 int	_wcsicoll (const wchar_t*, const wchar_t*);
 wchar_t* _wcslwr (wchar_t*);
-int	_wcsnicmp (const wchar_t*, const wchar_t*, size_t);
-wchar_t* _wcsnset (wchar_t*, wchar_t, size_t);
+int	_wcsnicmp (const wchar_t*, const wchar_t*, __CSTD size_t);
+wchar_t* _wcsnset (wchar_t*, wchar_t, __CSTD size_t);
 wchar_t* _wcsrev (wchar_t*);
 wchar_t* _wcsset (wchar_t*, wchar_t);
 wchar_t* _wcsupr (wchar_t*);
 
 #ifdef __MSVCRT__
-int  _wcsncoll(const wchar_t*, const wchar_t*, size_t);
-int  _wcsnicoll(const wchar_t*, const wchar_t*, size_t);
+int  _wcsncoll(const wchar_t*, const wchar_t*, __CSTD size_t);
+int  _wcsnicoll(const wchar_t*, const wchar_t*, __CSTD size_t);
 #endif
 
 #ifndef __NO_OLDNAMES
@@ -215,8 +215,8 @@ wchar_t* wcsdup (wchar_t*);
 int	wcsicmp (const wchar_t*, const wchar_t*);
 int	wcsicoll (const wchar_t*, const wchar_t*);
 wchar_t* wcslwr (wchar_t*);
-int	wcsnicmp (const wchar_t*, const wchar_t*, size_t);
-wchar_t* wcsnset (wchar_t*, wchar_t, size_t);
+int	wcsnicmp (const wchar_t*, const wchar_t*, __CSTD size_t);
+wchar_t* wcsnset (wchar_t*, wchar_t, __CSTD size_t);
 wchar_t* wcsrev (wchar_t*);
 wchar_t* wcsset (wchar_t*, wchar_t);
 wchar_t* wcsupr (wchar_t*);