diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 039dc6f74..b2a20b735 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2005-03-23  Christopher Faylor  <cgf@timesys.com>
+
+	* include/ctype.h: Always define macros when inside cygwin.
+	(isblank): New macro.
+
 2005-03-23  Corinna Vinschen  <corinna@vinschen.de>
 
 	* fhandler.h (fhandler_socket::eid_connect): Make private.
diff --git a/winsup/cygwin/include/ctype.h b/winsup/cygwin/include/ctype.h
index 8e7983a22..c317a30cd 100644
--- a/winsup/cygwin/include/ctype.h
+++ b/winsup/cygwin/include/ctype.h
@@ -40,8 +40,9 @@ int __cdecl _toupper(int);
 
 extern const char _ctype_[];
 
-#ifndef __cplusplus
+#if !defined(__cplusplus) || defined(__INSIDE_CYGWIN__)
 #define	isalpha(c)	((_ctype_+1)[(unsigned)(c)]&(_U|_L))
+#define isblank(c)	((c) == ' ' || (c) == '\t')
 #define	isupper(c)	((_ctype_+1)[(unsigned)(c)]&_U)
 #define	islower(c)	((_ctype_+1)[(unsigned)(c)]&_L)
 #define	isdigit(c)	((_ctype_+1)[(unsigned)(c)]&_N)
@@ -60,7 +61,7 @@ extern const char _ctype_[];
 	__extension__ ({ int __x = (c); isupper(__x) ? (__x - 'A' + 'a') : __x;})
 #endif /* !__cplusplus */
 
-#ifndef __STRICT_ANSI__
+#if !defined(__STRICT_ANSI__) || defined(__INSIDE_CYGWIN__)
 #define isascii(c)	((unsigned)(c)<=0177)
 #define toascii(c)	((c)&0177)
 #endif