diff options
| author | oehhar <harald.oehlmann@elmicron.de> | 2014-12-17 07:53:41 (GMT) |
|---|---|---|
| committer | oehhar <harald.oehlmann@elmicron.de> | 2014-12-17 07:53:41 (GMT) |
| commit | 691e34c6ccbee85bbd91e420504983345029d5ea (patch) | |
| tree | 53724883281fc684d74af9de3e4a0a1bfd56e946 /generic/tclIOSock.c | |
| parent | a9606871f5ddb7d6a8cd69f3fa0c41fe8b3c0396 (diff) | |
| parent | 2933029b8c2dfc2e4a8bd89cacad8aa53099d5d4 (diff) | |
| download | tcl-691e34c6ccbee85bbd91e420504983345029d5ea.zip tcl-691e34c6ccbee85bbd91e420504983345029d5ea.tar.gz tcl-691e34c6ccbee85bbd91e420504983345029d5ea.tar.bz2 | |
Merge trunk
Diffstat (limited to 'generic/tclIOSock.c')
| -rw-r--r-- | generic/tclIOSock.c | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/generic/tclIOSock.c b/generic/tclIOSock.c index 694501f..f69d30f 100644 --- a/generic/tclIOSock.c +++ b/generic/tclIOSock.c @@ -12,9 +12,26 @@ #include "tclInt.h" #if defined(_WIN32) && defined(UNICODE) -/* On Windows, we always need the ASCII version. */ -# undef gai_strerror -# define gai_strerror gai_strerrorA +/* On Windows, we need to do proper Unicode->UTF-8 conversion. */ + +typedef struct ThreadSpecificData { + int initialized; + Tcl_DString errorMsg; /* UTF-8 encoded error-message */ +} ThreadSpecificData; +static Tcl_ThreadDataKey dataKey; + +#undef gai_strerror +static const char *gai_strerror(int code) { + ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey); + + if (tsdPtr->initialized) { + Tcl_DStringFree(&tsdPtr->errorMsg); + } else { + tsdPtr->initialized = 1; + } + Tcl_WinTCharToUtf(gai_strerrorW(code), -1, &tsdPtr->errorMsg); + return Tcl_DStringValue(&tsdPtr->errorMsg); +} #endif /* |