diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-05-29 15:23:25 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-05-29 15:23:25 (GMT) |
| commit | fad48a7b6368bdb719b8b5cdc77f19ee4b089ee6 (patch) | |
| tree | 395ef36a3124aa88061682c8f522fe266d2fb73a /win/tkWinPort.h | |
| parent | 07212f98d3048b772094a64325e930e1c0364964 (diff) | |
| parent | c985425b2f03e2e14bf3f7ee9884cd74c184373e (diff) | |
| download | tk-fad48a7b6368bdb719b8b5cdc77f19ee4b089ee6.zip tk-fad48a7b6368bdb719b8b5cdc77f19ee4b089ee6.tar.gz tk-fad48a7b6368bdb719b8b5cdc77f19ee4b089ee6.tar.bz2 | |
merge core-8-4-branch
Diffstat (limited to 'win/tkWinPort.h')
| -rw-r--r-- | win/tkWinPort.h | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/win/tkWinPort.h b/win/tkWinPort.h index f991195..77408dc 100644 --- a/win/tkWinPort.h +++ b/win/tkWinPort.h @@ -40,16 +40,28 @@ #endif #include <time.h> -#ifdef __CYGWIN__ -# define _T(x) L##x -#else -# include <tchar.h> -#endif #ifdef _MSC_VER -# define hypot _hypot +# ifndef hypot +# define hypot _hypot +# endif #endif /* _MSC_VER */ +/* + * Pull in the typedef of TCHAR for windows. + */ +#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; +#endif + + #ifndef __GNUC__ # define strncasecmp strnicmp # define strcasecmp stricmp |