diff options
| author | donal.k.fellows@manchester.ac.uk <dkf> | 2012-05-07 09:29:30 (GMT) |
|---|---|---|
| committer | donal.k.fellows@manchester.ac.uk <dkf> | 2012-05-07 09:29:30 (GMT) |
| commit | a29de20e84920e884416627260c0f5447f9a4b1a (patch) | |
| tree | e0f859ff55d0846fe89ab5ddc6b0c1585a88a96c /generic | |
| parent | 4e931046359591c0cb3ac134cf1574ac7e8b2356 (diff) | |
| parent | 432c6e09d8e4f2e06e74bdcd037523e489f69d06 (diff) | |
| download | tcl-a29de20e84920e884416627260c0f5447f9a4b1a.zip tcl-a29de20e84920e884416627260c0f5447f9a4b1a.tar.gz tcl-a29de20e84920e884416627260c0f5447f9a4b1a.tar.bz2 | |
merge trunk
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tclIOSock.c | 2 | ||||
| -rw-r--r-- | generic/tclPlatDecls.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/generic/tclIOSock.c b/generic/tclIOSock.c index 538ca1d..89d6c02 100644 --- a/generic/tclIOSock.c +++ b/generic/tclIOSock.c @@ -88,7 +88,7 @@ TclSockGetPort( */ #if !defined(_WIN32) && !defined(__CYGWIN__) -# define SOCKET size_t +# define SOCKET int #endif int diff --git a/generic/tclPlatDecls.h b/generic/tclPlatDecls.h index 37f5479..2ed5fed 100644 --- a/generic/tclPlatDecls.h +++ b/generic/tclPlatDecls.h @@ -31,7 +31,7 @@ * TCHAR is needed here for win32, so if it is not defined yet do it here. * This way, we don't need to include <tchar.h> just for one define. */ -#if defined(_WIN32) && !defined(_TCHAR_DEFINED) +#if (defined(_WIN32) || defined(__CYGWIN__)) && !defined(_TCHAR_DEFINED) # if defined(_UNICODE) typedef wchar_t TCHAR; # else |