diff options
-rw-r--r-- | winsup/mingw/ChangeLog | 13 | ||||
-rw-r--r-- | winsup/mingw/include/ctype.h | 2 | ||||
-rw-r--r-- | winsup/mingw/include/stdio.h | 26 | ||||
-rw-r--r-- | winsup/mingw/include/stdlib.h | 2 | ||||
-rw-r--r-- | winsup/mingw/include/string.h | 38 | ||||
-rw-r--r-- | winsup/mingw/include/sys/types.h | 7 | ||||
-rw-r--r-- | winsup/mingw/include/time.h | 2 | ||||
-rw-r--r-- | winsup/mingw/include/wctype.h | 2 |
8 files changed, 55 insertions, 37 deletions
diff --git a/winsup/mingw/ChangeLog b/winsup/mingw/ChangeLog index 04495c64034..6a6812bbf38 100644 --- a/winsup/mingw/ChangeLog +++ b/winsup/mingw/ChangeLog @@ -1,3 +1,16 @@ +2002-10-11 Danny Smith <dannysmith@users.sourceforge.net> + + * include/ctype: Qualify wint_t with __CSTD + when in global namespace. + * include/wctype:Likewise. + * include/stdio.h: Qualify wint_t and size_t with __CSTD + when in global namespace. + * include/stdlib.h: Qualify size_t with __CSTD + when in global namespace. + * include/string.h: Likewise. + * include/time.h: Likewise. + * include/sys/types.h: Inject time_t into global namespace. + 2002-10-04 Danny Smith <dannysmith@users.sourceforge.net> Merge from mingw mainline. diff --git a/winsup/mingw/include/ctype.h b/winsup/mingw/include/ctype.h index 17301eff690..ead9f8fe81b 100644 --- a/winsup/mingw/include/ctype.h +++ b/winsup/mingw/include/ctype.h @@ -257,7 +257,7 @@ int iscsymf (int); int iscsym (int); #endif /* Not _NO_OLDNAMES */ -int is_wctype(wint_t, __CSTD wctype_t); /* Obsolete! */ +int is_wctype(__CSTD wint_t, __CSTD wctype_t); /* Obsolete! */ __END_CGLOBAL_NAMESPACE #endif /* Not __STRICT_ANSI__ */ diff --git a/winsup/mingw/include/stdio.h b/winsup/mingw/include/stdio.h index 0670e94d629..bc35a0fda81 100644 --- a/winsup/mingw/include/stdio.h +++ b/winsup/mingw/include/stdio.h @@ -42,7 +42,6 @@ #include <stddef.h> #endif /* Not RC_INVOKED */ - /* Flags for the iobuf structure */ #define _IOREAD 1 /* currently reading */ #define _IOWRT 2 /* currently writing */ @@ -226,13 +225,13 @@ int vsprintf (char*, const char*, __VALIST); __END_CSTD_NAMESPACE __BEGIN_CGLOBAL_NAMESPACE -int _snprintf (char*, size_t, const char*, ...); -int _vsnprintf (char*, size_t, const char*, __VALIST); +int _snprintf (char*, __CSTD size_t, const char*, ...); +int _vsnprintf (char*, __CSTD size_t, const char*, __VALIST); #ifndef __NO_ISOCEXT /* externs in libmingwex.a */ -int snprintf(char* s, size_t n, const char* format, ...); +int snprintf(char* s, __CSTD size_t, const char*, ...); extern __inline__ int -vsnprintf (char* __s, size_t __n, const char* __format, __VALIST __arg) +vsnprintf (char* __s, __CSTD size_t __n, const char* __format, __VALIST __arg) { return _vsnprintf ( __s, __n, __format, __arg); } #endif @@ -335,6 +334,7 @@ __END_CGLOBAL_NAMESPACE #ifndef _WSTDIO_DEFINED __BEGIN_CSTD_NAMESPACE /* also in wchar.h - keep in sync */ + int fwprintf (FILE*, const wchar_t*, ...); int wprintf (const wchar_t*, ...); int swprintf (wchar_t*, const wchar_t*, ...); @@ -377,12 +377,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 _snwprintf (wchar_t*, __CSTD size_t, const wchar_t*, ...); int _vsnwprintf (wchar_t*, 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 @@ -404,14 +404,14 @@ __CSTD FILE* wpopen (const wchar_t*, const wchar_t*); /* * Other Non ANSI wide functions */ -wint_t _fgetwchar (void); -wint_t _fputwchar (wint_t); +__CSTD wint_t _fgetwchar (void); +__CSTD wint_t _fputwchar (__CSTD wint_t); int _getw (__CSTD FILE*); int _putw (int, __CSTD FILE*); #ifndef _NO_OLDNAMES -wint_t fgetwchar (void); -wint_t fputwchar (wint_t); +__CSTD wint_t fgetwchar (void); +__CSTD wint_t fputwchar (__CSTD wint_t); int getw (__CSTD FILE*); int putw (int, __CSTD FILE*); #endif /* Not _NO_OLDNAMES */ @@ -422,7 +422,7 @@ int putw (int, __CSTD FILE*); * not zero'd out if you seek past the end and then write. */ int __mingw_fseek (__CSTD FILE *, long, int); -int __mingw_fwrite (const void*, size_t, size_t, __CSTD FILE*); +int __mingw_fwrite (const void*, __CSTD size_t, __CSTD size_t, __CSTD FILE*); #define fseek(fp, offset, whence) __mingw_fseek(fp, offset, whence) #define fwrite(buffer, size, count, fp) __mingw_fwrite(buffer, size, count, fp) #endif /* __USE_MINGW_FSEEK */ diff --git a/winsup/mingw/include/stdlib.h b/winsup/mingw/include/stdlib.h index e54b4e63d29..4734fd87b09 100644 --- a/winsup/mingw/include/stdlib.h +++ b/winsup/mingw/include/stdlib.h @@ -445,7 +445,7 @@ int _wputenv(const wchar_t*); void _wsearchenv(const wchar_t*, const wchar_t*, wchar_t*); void _wmakepath(wchar_t*, const wchar_t*, const wchar_t*, const wchar_t*, const wchar_t*); void _wsplitpath (const wchar_t*, wchar_t*, wchar_t*, wchar_t*, wchar_t*); -wchar_t* _wfullpath (wchar_t*, const wchar_t*, size_t); +wchar_t* _wfullpath (wchar_t*, const wchar_t*, __CSTD size_t); unsigned int _rotl(unsigned int, int); unsigned int _rotr(unsigned int, int); diff --git a/winsup/mingw/include/string.h b/winsup/mingw/include/string.h index 1d6e91656ce..da51709b9f6 100644 --- a/winsup/mingw/include/string.h +++ b/winsup/mingw/include/string.h @@ -77,23 +77,23 @@ __BEGIN_CGLOBAL_NAMESPACE * Extra non-ANSI functions provided by the CRTDLL library */ char* _strerror (const char *); -void* _memccpy (void*, const void*, int, size_t); -int _memicmp (const void*, const void*, size_t); +void* _memccpy (void*, const void*, int, __CSTD size_t); +int _memicmp (const void*, const void*, __CSTD size_t); char* _strdup (const char*); int _strcmpi (const char*, const char*); int _stricmp (const char*, const char*); int _stricoll (const char*, const char*); char* _strlwr (char*); -int _strnicmp (const char*, const char*, size_t); -char* _strnset (char*, int, size_t); +int _strnicmp (const char*, const char*, __CSTD size_t); +char* _strnset (char*, int, __CSTD size_t); char* _strrev (char*); char* _strset (char*, int); char* _strupr (char*); -void _swab (const char*, char*, size_t); +void _swab (const char*, char*, __CSTD size_t); #ifdef __MSVCRT__ -int _strncoll(const char*, const char*, size_t); -int _strnicoll(const char*, const char*, size_t); +int _strncoll(const char*, const char*, __CSTD size_t); +int _strnicoll(const char*, const char*, __CSTD size_t); #endif #ifndef _NO_OLDNAMES @@ -104,22 +104,22 @@ int _strnicoll(const char*, const char*, size_t); * strcasecmp. */ -void* memccpy (void*, const void*, int, size_t); -int memicmp (const void*, const void*, size_t); +void* memccpy (void*, const void*, int, __CSTD size_t); +int memicmp (const void*, const void*, __CSTD size_t); char* strdup (const char*); int strcmpi (const char*, const char*); int stricmp (const char*, const char*); int strcasecmp (const char*, const char*); int stricoll (const char*, const char*); char* strlwr (char*); -int strnicmp (const char*, const char*, size_t); -int strncasecmp (const char*, const char*, size_t); -char* strnset (char*, int, size_t); +int strnicmp (const char*, const char*, __CSTD size_t); +int strncasecmp (const char*, const char*, __CSTD size_t); +char* strnset (char*, int, __CSTD size_t); char* strrev (char*); char* strset (char*, int); char* strupr (char*); #ifndef _UWIN -void swab (const char*, char*, size_t); +void swab (const char*, char*, __CSTD size_t); #endif /* _UWIN */ #endif /* Not _NO_OLDNAMES */ @@ -167,15 +167,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 @@ -185,8 +185,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*); diff --git a/winsup/mingw/include/sys/types.h b/winsup/mingw/include/sys/types.h index dd78a741a80..66b7eaca679 100644 --- a/winsup/mingw/include/sys/types.h +++ b/winsup/mingw/include/sys/types.h @@ -42,10 +42,15 @@ #ifndef _TIME_T_DEFINED +#define _TIME_T_DEFINED __BEGIN_CSTD_NAMESPACE typedef long time_t; __END_CSTD_NAMESPACE -#define _TIME_T_DEFINED +#endif + +/* If we include this non-std header, we inject time_t into global */ +#if defined (__cplusplus) && (__HAVE_STD_CXX) +using __CSTD time_t; #endif diff --git a/winsup/mingw/include/time.h b/winsup/mingw/include/time.h index 2e520fb9f9f..5bc85381e5c 100644 --- a/winsup/mingw/include/time.h +++ b/winsup/mingw/include/time.h @@ -123,7 +123,7 @@ extern void _tzset (void); extern void tzset (void); #endif -size_t strftime(char*, size_t, const char*, const struct tm*); +size_t strftime(char*, __CSTD size_t, const char*, const struct __CSTD tm*); char* _strdate(char*); char* _strtime(char*); diff --git a/winsup/mingw/include/wctype.h b/winsup/mingw/include/wctype.h index efa2f0ba14e..1c5b1adcb60 100644 --- a/winsup/mingw/include/wctype.h +++ b/winsup/mingw/include/wctype.h @@ -131,7 +131,7 @@ __END_CSTD_NAMESPACE #ifndef __STRICT_ANSI__ __BEGIN_CGLOBAL_NAMESPACE -int is_wctype(wint_t, __CSTD wctype_t); /* Obsolete! */ +int is_wctype(__CSTD wint_t, __CSTD wctype_t); /* Obsolete! */ __END_CGLOBAL_NAMESPACE #endif /* __STRICT_ANSI__ */ |