* 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.

diff --git a/winsup/mingw/ChangeLog b/winsup/mingw/ChangeLog
index b9af074b43cce235a559d1861ebd6577f65df8ae..bcf57c3c28faef41263f50f6a3d616a9edf22579 100644 (file)
--- 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 e93d05b851309c3a61576e1d74300b7bdb232ca0..4c094eb12e7e2f19722a1517eb090a10be7d0fc3 100644 (file)
--- 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 fe4163fd4f3704d56505da6f18b8619bfd16ec16..12660345415e97efd7770c3b71fdcbdb66db304f 100644 (file)
--- 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 9aa9229edc3ce718a5c706384f2b6cd01c96217e..edac44534e88b98b310d7df26feb7a985143f10d 100644 (file)
--- 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