diff options
author | nijtmans <nijtmans> | 2010-09-09 14:30:20 (GMT) |
---|---|---|
committer | nijtmans <nijtmans> | 2010-09-09 14:30:20 (GMT) |
commit | d1ed32ffcf622ff5726f978e7243ae775dcb70d5 (patch) | |
tree | 3a47e54eec14bb4a5223118b306c2a7f04c021f9 /win/tclWinPort.h | |
parent | 88f1f1e8378e9842ed80c24e5d0c5bb29cd75cf6 (diff) | |
download | tcl-d1ed32ffcf622ff5726f978e7243ae775dcb70d5.zip tcl-d1ed32ffcf622ff5726f978e7243ae775dcb70d5.tar.gz tcl-d1ed32ffcf622ff5726f978e7243ae775dcb70d5.tar.bz2 |
mingw should always link with -ladvapi32
Remove ascii variant of tkWinPocs table,
it is no longer necessary. Fix CreateProcess
signature and remove unused GetModuleFileName and lstrcpy
mingw/cygwin fixes: <tchar.h> should always
be included, and fix conflict in various macro values: Always force
the same values as in VC++.
Diffstat (limited to 'win/tclWinPort.h')
-rw-r--r-- | win/tclWinPort.h | 49 |
1 files changed, 20 insertions, 29 deletions
diff --git a/win/tclWinPort.h b/win/tclWinPort.h index 481a396..1acf980 100644 --- a/win/tclWinPort.h +++ b/win/tclWinPort.h @@ -10,7 +10,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclWinPort.h,v 1.59 2010/06/24 13:26:04 nijtmans Exp $ + * RCS: @(#) $Id: tclWinPort.h,v 1.60 2010/09/09 14:30:20 nijtmans Exp $ */ #ifndef _TCLWINPORT @@ -38,13 +38,11 @@ /* * Pull in the typedef of TCHAR for windows. */ -#if !defined(_TCHAR_DEFINED) -# include <tchar.h> -# ifndef _TCHAR_DEFINED - /* Borland seems to forget to set this. */ - typedef _TCHAR TCHAR; -# define _TCHAR_DEFINED -# endif +#include <tchar.h> +#ifndef _TCHAR_DEFINED + /* Borland seems to forget to set this. */ + typedef _TCHAR TCHAR; +# define _TCHAR_DEFINED #endif /* @@ -234,27 +232,20 @@ #endif -#ifndef ESOCKTNOSUPPORT -# define ESOCKTNOSUPPORT WSAESOCKTNOSUPPORT /* Socket type not supported */ -#endif -#ifndef ESHUTDOWN -# define ESHUTDOWN WSAESHUTDOWN /* Can't send after socket shutdown */ -#endif -#ifndef ETOOMANYREFS -# define ETOOMANYREFS WSAETOOMANYREFS /* Too many references: can't splice */ -#endif -#ifndef EHOSTDOWN -# define EHOSTDOWN WSAEHOSTDOWN /* Host is down */ -#endif -#ifndef EUSERS -# define EUSERS WSAEUSERS /* Too many users (for UFS) */ -#endif -#ifndef EDQUOT -# define EDQUOT WSAEDQUOT /* Disc quota exceeded */ -#endif -#ifndef ESTALE -# define ESTALE WSAESTALE /* Stale NFS file handle */ -#endif +#undef ESOCKTNOSUPPORT +#define ESOCKTNOSUPPORT WSAESOCKTNOSUPPORT /* Socket type not supported */ +#undef ESHUTDOWN +#define ESHUTDOWN WSAESHUTDOWN /* Can't send after socket shutdown */ +#undef ETOOMANYREFS +#define ETOOMANYREFS WSAETOOMANYREFS /* Too many references: can't splice */ +#undef EHOSTDOWN +#define EHOSTDOWN WSAEHOSTDOWN /* Host is down */ +#undef EUSERS +#define EUSERS WSAEUSERS /* Too many users (for UFS) */ +#undef EDQUOT +#define EDQUOT WSAEDQUOT /* Disc quota exceeded */ +#undef ESTALE +#define ESTALE WSAESTALE /* Stale NFS file handle */ /* * Signals not known to the standard ANSI signal.h. These are used |