Index: generic/tcl.h
===================================================================
RCS file: /cvsroot/tcl/tcl/generic/tcl.h,v
retrieving revision 1.214
diff -u -3 -p -r1.214 tcl.h
--- generic/tcl.h	18 Aug 2006 07:45:31 -0000	1.214
+++ generic/tcl.h	4 Sep 2006 05:01:23 -0000
@@ -187,7 +187,7 @@ extern "C" {
  *       MSVCRT.  
  */
 
-#if (defined(__WIN32__) && (defined(_MSC_VER) || (__BORLANDC__ >= 0x0550) || defined(__LCC__) || defined(__WATCOMC__) || (defined(__GNUC__) && defined(__declspec))))
+#if (defined(__WIN32__) && !defined(__CYGWIN__) && (defined(_MSC_VER) || (__BORLANDC__ >= 0x0550) || defined(__LCC__) || defined(__WATCOMC__) || (defined(__GNUC__) && defined(__declspec))))
 #   define HAVE_DECLSPEC 1
 #endif
 
@@ -382,6 +382,9 @@ typedef long LONG;
 #      if defined(__WIN32__) && !defined(__CYGWIN__)
 #         define TCL_LL_MODIFIER        "I64"
 #         define TCL_LL_MODIFIER_SIZE   3
+#      elif defined(__CYGWIN__)
+#         define TCL_LL_MODIFIER	"ll"
+#         define TCL_LL_MODIFIER_SIZE	2
 #      else
 #         define TCL_LL_MODIFIER	"L"
 #         define TCL_LL_MODIFIER_SIZE	1