diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-05-07 08:27:28 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-05-07 08:27:28 (GMT) |
| commit | 4229e3c1ff708b65c55ee82c5fec89259c461d7b (patch) | |
| tree | c04b43cf0208192663f5f4c077abc67e02f796d1 | |
| parent | 14452102b5028ba9b20ceae48237a751f97f3b43 (diff) | |
| parent | 44f9dae0c50ffda941a790229ff3df1eec600aae (diff) | |
| download | tcl-4229e3c1ff708b65c55ee82c5fec89259c461d7b.zip tcl-4229e3c1ff708b65c55ee82c5fec89259c461d7b.tar.gz tcl-4229e3c1ff708b65c55ee82c5fec89259c461d7b.tar.bz2 | |
move TCHAR definition for Cygwin from tclUnixPort.h to tclPlatDecls.h,
so it can be used for the Plat* interfaces as well
| -rw-r--r-- | generic/tclIOSock.c | 2 | ||||
| -rw-r--r-- | generic/tclPlatDecls.h | 2 | ||||
| -rw-r--r-- | unix/tclUnixPort.h | 1 |
3 files changed, 2 insertions, 3 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 diff --git a/unix/tclUnixPort.h b/unix/tclUnixPort.h index fac9f75..c56988e 100644 --- a/unix/tclUnixPort.h +++ b/unix/tclUnixPort.h @@ -88,7 +88,6 @@ typedef off_t Tcl_SeekOffset; # define HINSTANCE void * # define SOCKET unsigned int # define WSAEWOULDBLOCK 10035 - typedef char TCHAR; typedef unsigned short WCHAR; DLLIMPORT extern __stdcall int GetModuleHandleExW(unsigned int, const char *, void *); DLLIMPORT extern __stdcall int GetModuleFileNameW(void *, const char *, int); |