summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2012-04-24 21:50:55 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2012-04-24 21:50:55 (GMT)
commit5e51fad7d7a9da7e201afd58883e13e04b2aae74 (patch)
treec124e19c0563ee0badd958cfbb8c9ed0510c029c /generic
parentba6b591305160eeaaeb81879d4a1cc669c24f4fa (diff)
downloadtcl-5e51fad7d7a9da7e201afd58883e13e04b2aae74.zip
tcl-5e51fad7d7a9da7e201afd58883e13e04b2aae74.tar.gz
tcl-5e51fad7d7a9da7e201afd58883e13e04b2aae74.tar.bz2
fix merge error
Diffstat (limited to 'generic')
-rw-r--r--generic/tclIntPlatDecls.h2
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