summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDanny Smith <dannysmith@users.sourceforge.net>2006-08-25 09:10:05 +0000
committerDanny Smith <dannysmith@users.sourceforge.net>2006-08-25 09:10:05 +0000
commit80f52ae1ddf0c69c23525aa7536db00917fd21f5 (patch)
tree010ca843355e9078b64bab27a4c2917712cae8a7
parentd82b4a993b5d446980a19cde21103648bc84e9c3 (diff)
downloadcygnal-80f52ae1ddf0c69c23525aa7536db00917fd21f5.tar.gz
cygnal-80f52ae1ddf0c69c23525aa7536db00917fd21f5.tar.bz2
cygnal-80f52ae1ddf0c69c23525aa7536db00917fd21f5.zip
* include/ctype.h: Expose iswblank if __cplusplus.
* include/wctype.h: Expose iswblank if __cplusplus.
-rw-r--r--winsup/mingw/ChangeLog5
-rw-r--r--winsup/mingw/include/ctype.h5
-rw-r--r--winsup/mingw/include/wctype.h4
3 files changed, 9 insertions, 5 deletions
diff --git a/winsup/mingw/ChangeLog b/winsup/mingw/ChangeLog
index e60266d91..810d7938b 100644
--- a/winsup/mingw/ChangeLog
+++ b/winsup/mingw/ChangeLog
@@ -1,3 +1,8 @@
+2006-08-25 Danny Smith <dannysmith@users.sourceforge.net>
+
+ * include/ctype.h: Expose iswblank if __cplusplus.
+ * include/wctype.h: Expose iswblank if __cplusplus.
+
2006-08-03 Danny Smith <dannysmith@users.sourceforge.net>
* include/ctype.h: Remove stray ')';
diff --git a/winsup/mingw/include/ctype.h b/winsup/mingw/include/ctype.h
index c04a07bd5..ad78d11a5 100644
--- a/winsup/mingw/include/ctype.h
+++ b/winsup/mingw/include/ctype.h
@@ -201,11 +201,10 @@ _CRTIMP int __cdecl iswupper(wint_t);
_CRTIMP int __cdecl iswxdigit(wint_t);
#if (defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) \
- || !defined __STRICT_ANSI__
+ || !defined __STRICT_ANSI__ || defined __cplusplus
int __cdecl iswblank (wint_t);
#endif
-
/* Older MS docs uses wchar_t for arg and return type, while newer
online MS docs say arg is wint_t and return is int.
ISO C uses wint_t for both. */
@@ -232,7 +231,7 @@ __CRT_INLINE int __cdecl iswupper(wint_t wc) {return (iswctype(wc,_UPPER));}
__CRT_INLINE int __cdecl iswxdigit(wint_t wc) {return (iswctype(wc,_HEX));}
__CRT_INLINE int __cdecl isleadbyte(int c) {return (_pctype[(unsigned char)(c)] & _LEADBYTE);}
#if (defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) \
- || !defined __STRICT_ANSI__
+ || !defined __STRICT_ANSI__ || __defined __cplusplus
__CRT_INLINE int __cdecl iswblank (wint_t wc)
{return (iswctype(wc,_BLANK) || wc == L'\t');}
#endif
diff --git a/winsup/mingw/include/wctype.h b/winsup/mingw/include/wctype.h
index 630b994ef..9ca33bb0b 100644
--- a/winsup/mingw/include/wctype.h
+++ b/winsup/mingw/include/wctype.h
@@ -80,7 +80,7 @@ _CRTIMP int __cdecl iswupper(wint_t);
_CRTIMP int __cdecl iswxdigit(wint_t);
#if (defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) \
- || !defined __STRICT_ANSI__
+ || !defined __STRICT_ANSI__ || defined __cplusplus
int __cdecl iswblank (wint_t);
#endif
@@ -134,7 +134,7 @@ __CRT_INLINE int __cdecl iswxdigit(wint_t wc) {return (iswctype(wc,_HEX));}
__CRT_INLINE int __cdecl isleadbyte(int c) {return (_pctype[(unsigned char)(c)] & _LEADBYTE);}
#if (defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) \
- || !defined __STRICT_ANSI__
+ || !defined __STRICT_ANSI__ || defined __cplusplus
__CRT_INLINE int __cdecl iswblank (wint_t wc)
{return (iswctype(wc, _BLANK) || wc == L'\t');}
#endif