summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2012-08-20 09:12:39 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2012-08-20 09:12:39 (GMT)
commiteb9bcac9c6ae30bb3e5f6bc298ee8238927a93e1 (patch)
treead4f6154d11316178dc93d74e7733cbb09886a7f /win
parent655c8c52be3b109ab737475210e3cd877921076c (diff)
parentac385804788ee5d3a9ee7929a7df56b930b6b8d7 (diff)
downloadtcl-eb9bcac9c6ae30bb3e5f6bc298ee8238927a93e1.zip
tcl-eb9bcac9c6ae30bb3e5f6bc298ee8238927a93e1.tar.gz
tcl-eb9bcac9c6ae30bb3e5f6bc298ee8238927a93e1.tar.bz2
Remove wrapper macro for ntohs(): unnecessary, because it doesn't require an initialized winsock_2 library
Diffstat (limited to 'win')
-rw-r--r--win/tclWinPort.h1
-rw-r--r--win/tclWinSock.c22
2 files changed, 2 insertions, 21 deletions
diff --git a/win/tclWinPort.h b/win/tclWinPort.h
index c6ac2b7..48f7894 100644
--- a/win/tclWinPort.h
+++ b/win/tclWinPort.h
@@ -538,7 +538,6 @@ typedef DWORD_PTR * PDWORD_PTR;
#define getservbyname TclWinGetServByName
#define getsockopt TclWinGetSockOpt
-#define ntohs TclWinNToHS
#define setsockopt TclWinSetSockOpt
/* This type is not defined in the Windows headers */
#define socklen_t int
diff --git a/win/tclWinSock.c b/win/tclWinSock.c
index 9f7caee..1a74354 100644
--- a/win/tclWinSock.c
+++ b/win/tclWinSock.c
@@ -72,7 +72,6 @@
#undef getservbyname
#undef getsockopt
-#undef ntohs
#undef setsockopt
/*
@@ -163,7 +162,7 @@ struct SocketInfo {
* socket event occurs.
*/
-typedef struct SocketEvent {
+typedef struct {
Tcl_Event header; /* Information that is standard for all
* events. */
SOCKET socket; /* Socket descriptor that is ready. Used to
@@ -191,7 +190,7 @@ typedef struct SocketEvent {
#define SOCKET_PENDING (1<<3) /* A message has been sent for this
* socket */
-typedef struct ThreadSpecificData {
+typedef struct {
HWND hwnd; /* Handle to window for socket messages. */
HANDLE socketThread; /* Thread handling the window */
Tcl_ThreadId threadId; /* Parent thread. */
@@ -2736,23 +2735,6 @@ TclWinSetSockOpt(
return setsockopt(s, level, optname, optval, optlen);
}
-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)