diff options
| author | Danny Smith <dannysmith@users.sourceforge.net> | 2007-06-28 07:13:04 +0000 |
|---|---|---|
| committer | Danny Smith <dannysmith@users.sourceforge.net> | 2007-06-28 07:13:04 +0000 |
| commit | a4b5a24055334025e399b3d1b06985a39beeaa84 (patch) | |
| tree | 3ab412552d90369332bad26945637f2ea848a056 | |
| parent | 41391cb2bba626aeb1e6ab7f65eb87eec6f93f1a (diff) | |
| download | cygnal-a4b5a24055334025e399b3d1b06985a39beeaa84.tar.gz cygnal-a4b5a24055334025e399b3d1b06985a39beeaa84.tar.bz2 cygnal-a4b5a24055334025e399b3d1b06985a39beeaa84.zip | |
* msvcrt.def.in: Update comment.
Exclude _ctype stub if using msvcr71.dll or newer.
* include/ctype.h: Don't declare _ctype if using msvcr71.dll or newer.
* include/wctype.h: Likewise.
| -rw-r--r-- | winsup/mingw/ChangeLog | 7 | ||||
| -rw-r--r-- | winsup/mingw/include/ctype.h | 10 | ||||
| -rw-r--r-- | winsup/mingw/include/wctype.h | 10 | ||||
| -rw-r--r-- | winsup/mingw/msvcrt.def.in | 4 |
4 files changed, 24 insertions, 7 deletions
diff --git a/winsup/mingw/ChangeLog b/winsup/mingw/ChangeLog index b9af074b4..bcf57c3c2 100644 --- a/winsup/mingw/ChangeLog +++ b/winsup/mingw/ChangeLog @@ -1,3 +1,10 @@ +2007-06-28 Danny Smith <dannysmith@users.sourceforge.net> + + * msvcrt.def.in: Update comment. + Exclude _ctype stub if using msvcr71.dll or newer. + * include/ctype.h: Don't declare _ctype if using msvcr71.dll or newer. + * include/wctype.h: Likewise. + 2007-06-23 Danny Smith <dannysmith@users.sourceforge.net> *include/wctype.h: Qualify all functions with __MINGW_NOTHROW. diff --git a/winsup/mingw/include/ctype.h b/winsup/mingw/include/ctype.h index e93d05b85..4c094eb12 100644 --- a/winsup/mingw/include/ctype.h +++ b/winsup/mingw/include/ctype.h @@ -108,7 +108,9 @@ _CRTIMP int __cdecl __MINGW_NOTHROW _toupper(int); #ifdef __DECLSPEC_SUPPORTED -__MINGW_IMPORT unsigned short _ctype[]; +# if __MSVCRT_VERSION__ <= 0x0700 + __MINGW_IMPORT unsigned short _ctype[]; +# endif # ifdef __MSVCRT__ __MINGW_IMPORT unsigned short* _pctype; # else /* CRTDLL */ @@ -117,8 +119,10 @@ __MINGW_IMPORT unsigned short _ctype[]; # endif #else /* __DECLSPEC_SUPPORTED */ -extern unsigned short** _imp___ctype; -#define _ctype (*_imp___ctype) +# if __MSVCRT_VERSION__ <= 0x0700 + extern unsigned short** _imp___ctype; +# define _ctype (*_imp___ctype) +# endif # ifdef __MSVCRT__ extern unsigned short** _imp___pctype; # define _pctype (*_imp___pctype) diff --git a/winsup/mingw/include/wctype.h b/winsup/mingw/include/wctype.h index fe4163fd4..126603454 100644 --- a/winsup/mingw/include/wctype.h +++ b/winsup/mingw/include/wctype.h @@ -95,7 +95,9 @@ _CRTIMP int __cdecl __MINGW_NOTHROW isleadbyte (int); /* Also in ctype.h */ #ifdef __DECLSPEC_SUPPORTED -__MINGW_IMPORT unsigned short _ctype[]; +# if __MSVCRT_VERSION__ <= 0x0700 + __MINGW_IMPORT unsigned short _ctype[]; +# endif # ifdef __MSVCRT__ __MINGW_IMPORT unsigned short* _pctype; # else /* CRTDLL */ @@ -104,8 +106,10 @@ __MINGW_IMPORT unsigned short _ctype[]; # endif #else /* ! __DECLSPEC_SUPPORTED */ -extern unsigned short** _imp___ctype; -#define _ctype (*_imp___ctype) +# if __MSVCRT_VERSION__ <= 0x0700 + extern unsigned short** _imp___ctype; +# define _ctype (*_imp___ctype) +# endif # ifdef __MSVCRT__ extern unsigned short** _imp___pctype; # define _pctype (*_imp___pctype) diff --git a/winsup/mingw/msvcrt.def.in b/winsup/mingw/msvcrt.def.in index 9aa9229ed..edac44534 100644 --- a/winsup/mingw/msvcrt.def.in +++ b/winsup/mingw/msvcrt.def.in @@ -5,7 +5,7 @@ ;* This file is a part of the mingw-runtime package. ;* No warranty is given; refer to the file DISCLAIMER within the package. ; -; Exports from msvcrt.dll, msvcr70.dll and msvcr71.dll +; Exports from msvcrt.dll, msvcr70.dll, msvcr71.dll and msvcr80.dll ; ; NOTE: All exports, except for what appeared to be C++ mangled names, ; are included. Not all functions have prototypes in the headers @@ -148,7 +148,9 @@ _cprintf _cputs _creat _cscanf +#if !(__msvcr71__ || __msvcr71d__ || __msvcr80__ || __msvcr80d__) _ctype DATA +#endif _cwait _daylight DATA _dstbias DATA |