diff options
| author | gahr <gahr@gahr.ch> | 2016-04-04 11:25:12 (GMT) |
|---|---|---|
| committer | gahr <gahr@gahr.ch> | 2016-04-04 11:25:12 (GMT) |
| commit | 540521771129cfb3a851405ae4306448fea3e769 (patch) | |
| tree | 75feaeff0a9a36b53252789c8aebb45dbc0b2e49 /win/tclWinSock.c | |
| parent | 4b301d844892c52ec5fecce47f03c91a551639ca (diff) | |
| parent | b4d78562f6e023b1bf1accc8649c1a93b14be8d6 (diff) | |
| download | tcl-540521771129cfb3a851405ae4306448fea3e769.zip tcl-540521771129cfb3a851405ae4306448fea3e769.tar.gz tcl-540521771129cfb3a851405ae4306448fea3e769.tar.bz2 | |
merge trunktip_444
Diffstat (limited to 'win/tclWinSock.c')
| -rw-r--r-- | win/tclWinSock.c | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/win/tclWinSock.c b/win/tclWinSock.c index a022ed5..c71aa96 100644 --- a/win/tclWinSock.c +++ b/win/tclWinSock.c @@ -62,15 +62,6 @@ #undef TCL_FEATURE_KEEPALIVE_NAGLE /* - * Make sure to remove the redirection defines set in tclWinPort.h that is in - * use in other sections of the core, except for us. - */ - -#undef getservbyname -#undef getsockopt -#undef setsockopt - -/* * Helper macros to make parts of this file clearer. The macros do exactly * what they say on the tin. :-) They also only ever refer to their arguments * once, and so can be used without regard to side effects. @@ -90,7 +81,7 @@ */ static int initialized = 0; -static const TCHAR classname[] = TEXT("TclSocket"); +static const TCHAR className[] = TEXT("TclSocket"); TCL_DECLARE_MUTEX(socketMutex) /* @@ -2336,7 +2327,7 @@ InitSockets(void) windowClass.hInstance = TclWinGetTclInstance(); windowClass.hbrBackground = NULL; windowClass.lpszMenuName = NULL; - windowClass.lpszClassName = classname; + windowClass.lpszClassName = className; windowClass.lpfnWndProc = SocketProc; windowClass.hIcon = NULL; windowClass.hCursor = NULL; @@ -2466,7 +2457,7 @@ SocketExitHandler( */ TclpFinalizeSockets(); - UnregisterClass(classname, TclWinGetTclInstance()); + UnregisterClass(className, TclWinGetTclInstance()); initialized = 0; Tcl_MutexUnlock(&socketMutex); } @@ -2992,7 +2983,7 @@ SocketThread( * Create a dummy window receiving socket events. */ - tsdPtr->hwnd = CreateWindow(classname, classname, WS_TILED, 0, 0, 0, 0, + tsdPtr->hwnd = CreateWindow(className, className, WS_TILED, 0, 0, 0, 0, NULL, NULL, windowClass.hInstance, arg); /* |