summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2012-05-03 09:01:02 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2012-05-03 09:01:02 (GMT)
commit712d308e92f67f88efc00a5e35e270f8821490a4 (patch)
tree8d08f0ef8febff79553a1ee5611a9216e744bbf0
parentb01b765d7b57559048e606b7a01156a807b26b9c (diff)
downloadtcl-712d308e92f67f88efc00a5e35e270f8821490a4.zip
tcl-712d308e92f67f88efc00a5e35e270f8821490a4.tar.gz
tcl-712d308e92f67f88efc00a5e35e270f8821490a4.tar.bz2
move some more CYGWIN stuff to unix/tclUnixPort.h
-rw-r--r--generic/tclPlatDecls.h4
-rw-r--r--unix/tclUnixPort.h14
-rw-r--r--win/tclWinError.c5
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
-
/*
*----------------------------------------------------------------------
*