summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2014-04-16 09:44:12 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2014-04-16 09:44:12 (GMT)
commitfcca5df8d6fb5bfd7dd4b6d10dbef115565ddc3f (patch)
treea8378e57b9eeb9e337a290adaf5a181c090624fc /generic
parent5b2fb226337c9700f2e12762dcfad77bdded8314 (diff)
parent7284ed46fb1ee885dfde86495027dd9be690a8bf (diff)
downloadtcl-fcca5df8d6fb5bfd7dd4b6d10dbef115565ddc3f.zip
tcl-fcca5df8d6fb5bfd7dd4b6d10dbef115565ddc3f.tar.gz
tcl-fcca5df8d6fb5bfd7dd4b6d10dbef115565ddc3f.tar.bz2
Upgrade from Winsock 1.1 to Winsock 2.2, which is always available on Win2000+. See: [http://msdn.microsoft.com/en-us/library/windows/desktop/ms742213%28v=vs.85%29.aspx] for details.
Move winsock initialization to TclpInitPlatform(void), so we can be sure everywhere that we have an initialized winsock2. Stub entries for TclWinGetServByName/TclWinGetSockOpt/TclWinSetSockOpt are no longer necessary (will be removed in 9.0, but are kept in 8.x)
Diffstat (limited to 'generic')
-rw-r--r--generic/tclIntPlatDecls.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/generic/tclIntPlatDecls.h b/generic/tclIntPlatDecls.h
index 2c74b5a..eb02bb7 100644
--- a/generic/tclIntPlatDecls.h
+++ b/generic/tclIntPlatDecls.h
@@ -552,7 +552,13 @@ extern const TclIntPlatStubs *tclIntPlatStubsPtr;
#if defined(_WIN32) || defined(__CYGWIN__)
# undef TclWinNToHS
+# undef TclWinGetServByName
+# undef TclWinGetSockOpt
+# undef TclWinSetSockOpt
# define TclWinNToHS ntohs
+# define TclWinGetServByName getservbyname
+# define TclWinGetSockOpt getsockopt
+# define TclWinSetSockOpt setsockopt
#else
# undef TclpGetPid
# define TclpGetPid(pid) ((unsigned long) (pid))