diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-08-24 06:29:44 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-08-24 06:29:44 (GMT) |
| commit | e1f580d44308ba8f846d79d6d51ba1d8fc093712 (patch) | |
| tree | f085ee55e4005509e47547479424160363661ee4 | |
| parent | 1b1df98eb9755670524e036036bb887b86df8079 (diff) | |
| download | tcl-e1f580d44308ba8f846d79d6d51ba1d8fc093712.zip tcl-e1f580d44308ba8f846d79d6d51ba1d8fc093712.tar.gz tcl-e1f580d44308ba8f846d79d6d51ba1d8fc093712.tar.bz2 | |
make sure that extensions which might still use TclWinNToHS, now use ntohs directly.
| -rw-r--r-- | generic/tclIntPlatDecls.h | 5 | ||||
| -rw-r--r-- | generic/tclStubInit.c | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/generic/tclIntPlatDecls.h b/generic/tclIntPlatDecls.h index 34a23a4..1e68c9c 100644 --- a/generic/tclIntPlatDecls.h +++ b/generic/tclIntPlatDecls.h @@ -845,7 +845,10 @@ extern TclIntPlatStubs *tclIntPlatStubsPtr; #undef TclpLocaltime_unix #undef TclpGmtime_unix -#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 6a3207b..d06e174 100644 --- a/generic/tclStubInit.c +++ b/generic/tclStubInit.c @@ -76,6 +76,7 @@ MODULE_SCOPE TclStubs tclStubs; MODULE_SCOPE TclTomMathStubs tclTomMathStubs; #if defined(_WIN32) || defined(__CYGWIN__) +#undef TclWinNToHS unsigned short TclWinNToHS(unsigned short ns) { return ntohs(ns); } |