summaryrefslogtreecommitdiffstats
path: root/win/tclWinSock.c
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2012-05-23 04:43:56 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2012-05-23 04:43:56 (GMT)
commit68d4dd76ebfda8029af039e6f6fd403ca851ce21 (patch)
tree8472626ee14870d99d98f1cba4b051368ce24518 /win/tclWinSock.c
parenta6a7e5ca7699ad328ed645c207aaba8b69e32a53 (diff)
parente7a344471ef19a4d60d6fd62eb07fc1b2344f77e (diff)
downloadtcl-68d4dd76ebfda8029af039e6f6fd403ca851ce21.zip
tcl-68d4dd76ebfda8029af039e6f6fd403ca851ce21.tar.gz
tcl-68d4dd76ebfda8029af039e6f6fd403ca851ce21.tar.bz2
fix merge problem on Linux
Diffstat (limited to 'win/tclWinSock.c')
-rw-r--r--win/tclWinSock.c28
1 files changed, 22 insertions, 6 deletions
diff --git a/win/tclWinSock.c b/win/tclWinSock.c
index 019d8e9..9591163 100644
--- a/win/tclWinSock.c
+++ b/win/tclWinSock.c
@@ -1129,7 +1129,7 @@ CreateSocketAddress(
ZeroMemory(sockaddrPtr, sizeof(SOCKADDR_IN));
sockaddrPtr->sin_family = AF_INET;
- sockaddrPtr->sin_port = htons((u_short) (port & 0xFFFF));
+ sockaddrPtr->sin_port = htons((unsigned short) (port & 0xFFFF));
if (host == NULL) {
addr.s_addr = INADDR_ANY;
} else {
@@ -2512,9 +2512,25 @@ TclWinSetSockOpt(SOCKET s, int level, int optname, const char *optval,
return setsockopt(s, level, optname, optval, optlen);
}
-u_short
-TclWinNToHS(
- u_short netshort)
+unsigned short
+TclWinNToHS(unsigned short netshort)
+{
+ /*
+ * Check that WinSock is initialized; do not call it if not, to
+ * prevent system crashes. This can happen at exit time if the exit
+ * handler for WinSock ran before other exit handlers that want to
+ * use sockets.
+ */
+
+ if (!SocketsEnabled()) {
+ return (unsigned short) -1;
+ }
+
+ return ntohs(netshort);
+}
+
+char *
+TclpInetNtoa(struct in_addr addr)
{
/*
* Check that WinSock is initialized; do not call it if not, to prevent
@@ -2523,10 +2539,10 @@ TclWinNToHS(
*/
if (!SocketsEnabled()) {
- return (u_short) -1;
+ return NULL;
}
- return ntohs(netshort);
+ return inet_ntoa(addr);
}
struct servent *