diff options
author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2016-03-30 12:57:27 (GMT) |
---|---|---|
committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2016-03-30 12:57:27 (GMT) |
commit | df008ca3249de1390d881ced2ec3a0b95425d203 (patch) | |
tree | c57cb743901e5362565beba04f52879ba2417af8 /win/tclWinSock.c | |
parent | 6cf1f7bacfe7e787c6468eed2b41194dd1c6e333 (diff) | |
parent | 77ccaefbb1482145de9b9276979318e88b9e542e (diff) | |
download | tcl-df008ca3249de1390d881ced2ec3a0b95425d203.zip tcl-df008ca3249de1390d881ced2ec3a0b95425d203.tar.gz tcl-df008ca3249de1390d881ced2ec3a0b95425d203.tar.bz2 |
merge trunk
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); /* |