summaryrefslogtreecommitdiffstats
path: root/src/testlib/qtestdata.cpp
Commit message (Expand)AuthorAgeFilesLines
* Long live Qt for S60!axis2009-04-241-0/+122
value='bug_2413550'>bug_2413550 Tcl is a high-level, general-purpose, interpreted, dynamic programming language. It was designed with the goal of being very simple but powerful.
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--generic/tclStubInit.c7
-rw-r--r--win/tclWinPort.h1
-rw-r--r--win/tclWinSock.c22
3 files changed, 3 insertions, 27 deletions
diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c
index 7b73ee3..3be6b45 100644
--- a/generic/tclStubInit.c
+++ b/generic/tclStubInit.c
@@ -74,6 +74,7 @@ MODULE_SCOPE TclIntPlatStubs tclIntPlatStubs;
MODULE_SCOPE TclPlatStubs tclPlatStubs;
MODULE_SCOPE TclStubs tclStubs;
MODULE_SCOPE TclTomMathStubs tclTomMathStubs;
+#define TclWinNToHS ntohs
#ifdef __WIN32__
# define TclUnixWaitForFile 0
@@ -112,12 +113,6 @@ void *TclWinGetTclInstance()
return hInstance;
}
-unsigned short
-TclWinNToHS(unsigned short ns)
-{
- return ntohs(ns);
-}
-
int
TclWinSetSockOpt(SOCKET s, int level, int optname,
const char *optval, int optlen)
diff --git a/win/tclWinPort.h b/win/tclWinPort.h
index 4f9e8b8..f58014c 100644
--- a/win/tclWinPort.h
+++ b/win/tclWinPort.h
@@ -457,7 +457,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