From 712d308e92f67f88efc00a5e35e270f8821490a4 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 3 May 2012 09:01:02 +0000
Subject: move some more CYGWIN stuff to unix/tclUnixPort.h

---
 generic/tclPlatDecls.h |  4 +---
 unix/tclUnixPort.h     | 14 ++++++++++----
 win/tclWinError.c      |  5 -----
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/generic/tclPlatDecls.h b/generic/tclPlatDecls.h
index 7580f9c..3be40cb 100644
--- a/generic/tclPlatDecls.h
+++ b/generic/tclPlatDecls.h
@@ -13,9 +13,7 @@
 /*
  *  Pull in the typedef of TCHAR for windows.
  */
-#if defined(__CYGWIN__)
-    typedef char TCHAR;
-#elif defined(__WIN32__) && !defined(_TCHAR_DEFINED)
+#if defined(__WIN32__) && !defined(_TCHAR_DEFINED)
 #   include <tchar.h>
 #   ifndef _TCHAR_DEFINED
 	/* Borland seems to forget to set this. */
diff --git a/unix/tclUnixPort.h b/unix/tclUnixPort.h
index 9426697..b3133fb 100644
--- a/unix/tclUnixPort.h
+++ b/unix/tclUnixPort.h
@@ -74,10 +74,16 @@ typedef off_t		Tcl_SeekOffset;
 #endif
 
 #ifdef __CYGWIN__
-EXTERN int TclOSstat(const char *name, Tcl_StatBuf *statBuf);
-EXTERN int TclOSlstat(const char *name, Tcl_StatBuf *statBuf);
-#define NO_FSTATFS
-#undef HAVE_FTS
+#   define WSAEWOULDBLOCK 10035
+#   define HINSTANCE void *
+#   define HANDLE void *
+#   define DWORD unsigned int
+#   define SOCKET unsigned int
+#   typedef char TCHAR;
+    EXTERN int TclOSstat(const char *name, Tcl_StatBuf *statBuf);
+    EXTERN int TclOSlstat(const char *name, Tcl_StatBuf *statBuf);
+#   define NO_FSTATFS
+#   undef HAVE_FTS
 #elif defined(HAVE_STRUCT_STAT64)
 #   define TclOSstat		stat64
 #   define TclOSlstat		lstat64
diff --git a/win/tclWinError.c b/win/tclWinError.c
index d3126b1..a74d2e2 100644
--- a/win/tclWinError.c
+++ b/win/tclWinError.c
@@ -333,11 +333,6 @@ static CONST int wsaErrorTable[] = {
     EREMOTE		/* WSAEREMOTE */
 };
 
-#ifdef __CYGWIN__
-#   include <windows.h>
-#   define DWORD unsigned int
-#endif
-
 /*
  *----------------------------------------------------------------------
  *
-- 
cgit v0.12