diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-04-24 21:50:55 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-04-24 21:50:55 (GMT) |
| commit | e0311d16a8f5d0e2a740f60e623439d13b052b76 (patch) | |
| tree | c124e19c0563ee0badd958cfbb8c9ed0510c029c | |
| parent | eeaf019bbb30fc13ffc0b91f833413281004c760 (diff) | |
| download | tcl-e0311d16a8f5d0e2a740f60e623439d13b052b76.zip tcl-e0311d16a8f5d0e2a740f60e623439d13b052b76.tar.gz tcl-e0311d16a8f5d0e2a740f60e623439d13b052b76.tar.bz2 | |
fix merge error
| -rw-r--r-- | generic/tclIntPlatDecls.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/generic/tclIntPlatDecls.h b/generic/tclIntPlatDecls.h index a05c71a..bc0f4fd 100644 --- a/generic/tclIntPlatDecls.h +++ b/generic/tclIntPlatDecls.h @@ -638,6 +638,8 @@ extern const TclIntPlatStubs *tclIntPlatStubsPtr; #undef TclpLocaltime_unix #undef TclpGmtime_unix #undef TclIntPlatReserved13 +#undef TclWinConvertWSAError +#define TclWinConvertWSAError TclWinConvertError #if !defined(__WIN32__) # undef TclpGetPid |