From 03429fd21440f06a3317b04e943d11ef84df4b87 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <jan.nijtmans@noemail.net>
Date: Tue, 24 Apr 2012 21:50:55 +0000
Subject: fix merge error

FossilOrigin-Name: ca02a64d681a75b49744fbd6d01c5216842ead74
---
 generic/tclIntPlatDecls.h | 2 ++
 1 file changed, 2 insertions(+)

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
-- 
cgit v0.12