diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-03-23 15:53:52 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-03-23 15:53:52 (GMT) |
| commit | e59a3fc9085a57bbc964aa61790417af5797794d (patch) | |
| tree | 2e156a8b477c55fb54f1ba2a6bc62c03ef274c6d /generic | |
| parent | 7bfb05f7fb4dd46306021ae1e767db1edae74593 (diff) | |
| parent | fa9a43ff5fd981089f0a432872444073f8710c99 (diff) | |
| download | tcl-e59a3fc9085a57bbc964aa61790417af5797794d.zip tcl-e59a3fc9085a57bbc964aa61790417af5797794d.tar.gz tcl-e59a3fc9085a57bbc964aa61790417af5797794d.tar.bz2 | |
Revert some cygwin-related signature changes from [835f8e1e9d] (2010-01-22).
They were an attempt to make the cygwin port compile again, but since cygwin
is based on unix this serves no purpose any more.
Use EAGAIN in stead of EWOULDBLOCK, because in VS10+ the value of EWOULDBLOCK
is no longer the same as EAGAIN
Add tclWinError.c to the CYGWIN build.
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tclInt.decls | 10 | ||||
| -rw-r--r-- | generic/tclIntPlatDecls.h | 12 |
2 files changed, 11 insertions, 11 deletions
diff --git a/generic/tclInt.decls b/generic/tclInt.decls index cf88fd3..a476ee8 100644 --- a/generic/tclInt.decls +++ b/generic/tclInt.decls @@ -689,12 +689,12 @@ declare 169 { } declare 170 { int TclCheckInterpTraces(Tcl_Interp *interp, const char *command, - int numChars, Command *cmdPtr, int result, int traceFlags, + int numChars, Command *cmdPtr, int result, int traceFlags, int objc, Tcl_Obj *const objv[]) } declare 171 { int TclCheckExecutionTraces(Tcl_Interp *interp, const char *command, - int numChars, Command *cmdPtr, int result, int traceFlags, + int numChars, Command *cmdPtr, int result, int traceFlags, int objc, Tcl_Obj *const objv[]) } declare 172 { @@ -1016,10 +1016,10 @@ interface tclIntPlat # Windows specific functions declare 0 win { - void TclWinConvertError(unsigned long errCode) + void TclWinConvertError(DWORD errCode) } declare 1 win { - void TclWinConvertWSAError(unsigned long errCode) + void TclWinConvertWSAError(DWORD errCode) } declare 2 win { struct servent *TclWinGetServByName(const char *nm, @@ -1088,7 +1088,7 @@ declare 19 win { TclFile TclpOpenFile(const char *fname, int mode) } declare 20 win { - void TclWinAddProcess(void *hProcess, unsigned long id) + void TclWinAddProcess(HANDLE hProcess, DWORD id) } # removed permanently for 8.4 diff --git a/generic/tclIntPlatDecls.h b/generic/tclIntPlatDecls.h index 192005c..2169624 100644 --- a/generic/tclIntPlatDecls.h +++ b/generic/tclIntPlatDecls.h @@ -94,9 +94,9 @@ EXTERN int TclWinCPUID(unsigned int index, unsigned int *regs); #endif /* UNIX */ #ifdef __WIN32__ /* WIN */ /* 0 */ -EXTERN void TclWinConvertError(unsigned long errCode); +EXTERN void TclWinConvertError(DWORD errCode); /* 1 */ -EXTERN void TclWinConvertWSAError(unsigned long errCode); +EXTERN void TclWinConvertWSAError(DWORD errCode); /* 2 */ EXTERN struct servent * TclWinGetServByName(const char *nm, const char *proto); @@ -139,7 +139,7 @@ EXTERN TclFile TclpMakeFile(Tcl_Channel channel, int direction); /* 19 */ EXTERN TclFile TclpOpenFile(const char *fname, int mode); /* 20 */ -EXTERN void TclWinAddProcess(void *hProcess, unsigned long id); +EXTERN void TclWinAddProcess(HANDLE hProcess, DWORD id); /* Slot 21 is reserved */ /* 22 */ EXTERN TclFile TclpCreateTempFile(const char *contents); @@ -266,8 +266,8 @@ typedef struct TclIntPlatStubs { int (*tclWinCPUID) (unsigned int index, unsigned int *regs); /* 29 */ #endif /* UNIX */ #ifdef __WIN32__ /* WIN */ - void (*tclWinConvertError) (unsigned long errCode); /* 0 */ - void (*tclWinConvertWSAError) (unsigned long errCode); /* 1 */ + void (*tclWinConvertError) (DWORD errCode); /* 0 */ + void (*tclWinConvertWSAError) (DWORD errCode); /* 1 */ struct servent * (*tclWinGetServByName) (const char *nm, const char *proto); /* 2 */ int (*tclWinGetSockOpt) (SOCKET s, int level, int optname, char FAR *optval, int FAR *optlen); /* 3 */ HINSTANCE (*tclWinGetTclInstance) (void); /* 4 */ @@ -286,7 +286,7 @@ typedef struct TclIntPlatStubs { void (*reserved17)(void); TclFile (*tclpMakeFile) (Tcl_Channel channel, int direction); /* 18 */ TclFile (*tclpOpenFile) (const char *fname, int mode); /* 19 */ - void (*tclWinAddProcess) (void *hProcess, unsigned long id); /* 20 */ + void (*tclWinAddProcess) (HANDLE hProcess, DWORD id); /* 20 */ void (*reserved21)(void); TclFile (*tclpCreateTempFile) (const char *contents); /* 22 */ char * (*tclpGetTZName) (int isdst); /* 23 */ |