summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--generic/tclIOSock.c2
-rw-r--r--generic/tclPlatDecls.h19
-rw-r--r--unix/tclUnixPort.h5
3 files changed, 11 insertions, 15 deletions
diff --git a/generic/tclIOSock.c b/generic/tclIOSock.c
index 751241b..df7a13a 100644
--- a/generic/tclIOSock.c
+++ b/generic/tclIOSock.c
@@ -83,7 +83,7 @@ TclSockGetPort(
#undef TclSockMinimumBuffers
#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 d52a736..3d6339b 100644
--- a/generic/tclPlatDecls.h
+++ b/generic/tclPlatDecls.h
@@ -22,19 +22,16 @@
#endif
/*
- * Pull in the typedef of TCHAR for windows.
+ * 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)
-# include <tchar.h>
-# ifndef _TCHAR_DEFINED
- /* Borland seems to forget to set this. */
- typedef _TCHAR TCHAR;
-# define _TCHAR_DEFINED
-# endif
-# if defined(_MSC_VER) && defined(__STDC__)
- /* VS2005 SP1 misses this. See [Bug #3110161] */
- typedef _TCHAR TCHAR;
+#if (defined(_WIN32) || defined(__CYGWIN__)) && !defined(_TCHAR_DEFINED)
+# if defined(_UNICODE)
+ typedef wchar_t TCHAR;
+# else
+ typedef char TCHAR;
# endif
+# define _TCHAR_DEFINED
#endif
/* !BEGIN!: Do not edit below this line. */
diff --git a/unix/tclUnixPort.h b/unix/tclUnixPort.h
index 8b7fab1..8684757 100644
--- a/unix/tclUnixPort.h
+++ b/unix/tclUnixPort.h
@@ -83,7 +83,6 @@ typedef off_t Tcl_SeekOffset;
# define HINSTANCE void *
# define SOCKET unsigned int
# define WSAEWOULDBLOCK 10035
- typedef char TCHAR;
DLLIMPORT extern __stdcall int GetModuleHandleExW(unsigned int, const char *, void *);
DLLIMPORT extern __stdcall int GetModuleFileNameW(void *, const char *, int);
DLLIMPORT extern __stdcall int WideCharToMultiByte(int, int, const char *, int,
@@ -627,8 +626,8 @@ typedef int socklen_t;
#define TclpExit exit
#ifdef TCL_THREADS
-EXTERN struct tm * TclpLocaltime(CONST time_t *);
-EXTERN struct tm * TclpGmtime(CONST time_t *);
+EXTERN struct tm *TclpLocaltime(CONST time_t *);
+EXTERN struct tm *TclpGmtime(CONST time_t *);
/* #define localtime(x) TclpLocaltime(x)
* #define gmtime(x) TclpGmtime(x) */
# undef inet_ntoa