summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2012-08-24 06:33:04 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2012-08-24 06:33:04 (GMT)
commit3c48ab44dc2848cf9a052493f557f67fd854a786 (patch)
treee9307947c3d5dddf03ef7e5a82cad587c32eaff6
parent53c615a311188f20c2867619c49f87289a255bfd (diff)
parenta204742a21724c1f5404afff35e6450941ee13ac (diff)
downloadtcl-3c48ab44dc2848cf9a052493f557f67fd854a786.zip
tcl-3c48ab44dc2848cf9a052493f557f67fd854a786.tar.gz
tcl-3c48ab44dc2848cf9a052493f557f67fd854a786.tar.bz2
make sure that extensions which might still use TclWinNToHS, now use ntohs directly.
-rw-r--r--generic/tclIntPlatDecls.h5
-rw-r--r--generic/tclStubInit.c1
2 files changed, 5 insertions, 1 deletions
diff --git a/generic/tclIntPlatDecls.h b/generic/tclIntPlatDecls.h
index 7322a37..36cb918 100644
--- a/generic/tclIntPlatDecls.h
+++ b/generic/tclIntPlatDecls.h
@@ -525,7 +525,10 @@ extern const TclIntPlatStubs *tclIntPlatStubsPtr;
#undef TclWinConvertWSAError
#define TclWinConvertWSAError TclWinConvertError
-#if !defined(__WIN32__) && !defined(__CYGWIN__)
+#if defined(__WIN32__) || defined(__CYGWIN__)
+# undef TclWinNToHS
+# define TclWinNToHS ntohs
+#else
# undef TclpGetPid
# define TclpGetPid(pid) ((unsigned long) (pid))
#endif
diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c
index 4f562a7..0fc35d5 100644
--- a/generic/tclStubInit.c
+++ b/generic/tclStubInit.c
@@ -55,6 +55,7 @@ static int TclSockMinimumBuffersOld(int sock, int size)
#if defined(_WIN32) || defined(__CYGWIN__)
+#undef TclWinNToHS
#define TclWinNToHS winNToHS
static unsigned short TclWinNToHS(unsigned short ns) {
return ntohs(ns);