diff options
| author | nijtmans <nijtmans> | 2010-01-22 13:02:50 (GMT) |
|---|---|---|
| committer | nijtmans <nijtmans> | 2010-01-22 13:02:50 (GMT) |
| commit | 054ab462a502b5dd37f904ad14e46190554dd8ba (patch) | |
| tree | 55e1b5a3324a9e4ba5914c4e528a6d7c4f81933d /generic/tclIntPlatDecls.h | |
| parent | cc52b4d3c7d8a2d088216976f32ca253b404c75d (diff) | |
| download | tcl-054ab462a502b5dd37f904ad14e46190554dd8ba.zip tcl-054ab462a502b5dd37f904ad14e46190554dd8ba.tar.gz tcl-054ab462a502b5dd37f904ad14e46190554dd8ba.tar.bz2 | |
Revert [2009-12-21] change in tcl.h, in stead
resolve the CYGWIN inclusion problems by
re-arranging the inclusions at other places.
Make cygwin configuration error into
a warning: CYGWIN compilation works
although there still are test failures.
Diffstat (limited to 'generic/tclIntPlatDecls.h')
| -rw-r--r-- | generic/tclIntPlatDecls.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/generic/tclIntPlatDecls.h b/generic/tclIntPlatDecls.h index b3a55ac..620a73d 100644 --- a/generic/tclIntPlatDecls.h +++ b/generic/tclIntPlatDecls.h @@ -9,7 +9,7 @@ * Copyright (c) 1998-1999 by Scriptics Corporation. * All rights reserved. * - * RCS: @(#) $Id: tclIntPlatDecls.h,v 1.39 2009/04/10 18:02:36 das Exp $ + * RCS: @(#) $Id: tclIntPlatDecls.h,v 1.40 2010/01/22 13:02:50 nijtmans Exp $ */ #ifndef _TCLINTPLATDECLS @@ -124,12 +124,12 @@ EXTERN int TclUnixCopyFile (const char * src, const char * dst, #ifndef TclWinConvertError_TCL_DECLARED #define TclWinConvertError_TCL_DECLARED /* 0 */ -EXTERN void TclWinConvertError (DWORD errCode); +EXTERN void TclWinConvertError (unsigned long errCode); #endif #ifndef TclWinConvertWSAError_TCL_DECLARED #define TclWinConvertWSAError_TCL_DECLARED /* 1 */ -EXTERN void TclWinConvertWSAError (DWORD errCode); +EXTERN void TclWinConvertWSAError (unsigned long errCode); #endif #ifndef TclWinGetServByName_TCL_DECLARED #define TclWinGetServByName_TCL_DECLARED @@ -218,7 +218,7 @@ EXTERN TclFile TclpOpenFile (const char * fname, int mode); #ifndef TclWinAddProcess_TCL_DECLARED #define TclWinAddProcess_TCL_DECLARED /* 20 */ -EXTERN void TclWinAddProcess (HANDLE hProcess, DWORD id); +EXTERN void TclWinAddProcess (void * hProcess, unsigned long id); #endif /* Slot 21 is reserved */ #ifndef TclpCreateTempFile_TCL_DECLARED @@ -398,8 +398,8 @@ typedef struct TclIntPlatStubs { int (*tclUnixCopyFile) (const char * src, const char * dst, const Tcl_StatBuf * statBufPtr, int dontCopyAtts); /* 14 */ #endif /* UNIX */ #ifdef __WIN32__ /* WIN */ - void (*tclWinConvertError) (DWORD errCode); /* 0 */ - void (*tclWinConvertWSAError) (DWORD errCode); /* 1 */ + void (*tclWinConvertError) (unsigned long errCode); /* 0 */ + void (*tclWinConvertWSAError) (unsigned long errCode); /* 1 */ struct servent * (*tclWinGetServByName) (const char * nm, const char * proto); /* 2 */ int (*tclWinGetSockOpt) (int s, int level, int optname, char FAR * optval, int FAR * optlen); /* 3 */ HINSTANCE (*tclWinGetTclInstance) (void); /* 4 */ @@ -418,7 +418,7 @@ typedef struct TclIntPlatStubs { void *reserved17; TclFile (*tclpMakeFile) (Tcl_Channel channel, int direction); /* 18 */ TclFile (*tclpOpenFile) (const char * fname, int mode); /* 19 */ - void (*tclWinAddProcess) (HANDLE hProcess, DWORD id); /* 20 */ + void (*tclWinAddProcess) (void * hProcess, unsigned long id); /* 20 */ void *reserved21; TclFile (*tclpCreateTempFile) (const char * contents); /* 22 */ char * (*tclpGetTZName) (int isdst); /* 23 */ |