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 | a204742a21724c1f5404afff35e6450941ee13ac (patch) | |
| tree | f085ee55e4005509e47547479424160363661ee4 | |
| parent | b02e97a2b368aa22f4d35a51ab1d3efdf197352b (diff) | |
| download | tcl-a204742a21724c1f5404afff35e6450941ee13ac.zip tcl-a204742a21724c1f5404afff35e6450941ee13ac.tar.gz tcl-a204742a21724c1f5404afff35e6450941ee13ac.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); } |