diff options
| author | dkf <donal.k.fellows@manchester.ac.uk> | 2012-09-04 21:35:21 (GMT) |
|---|---|---|
| committer | dkf <donal.k.fellows@manchester.ac.uk> | 2012-09-04 21:35:21 (GMT) |
| commit | a50dcb923a50640e31a433c872caa63630d8202d (patch) | |
| tree | b5db0420431479a99a1a92ade263f2d177ff1e7f /generic/tclIntPlatDecls.h | |
| parent | 25925f6f8e072a0bc3cf719c7684eff79f96ed8f (diff) | |
| parent | 4c8d436cd9e92ed6a304fed697f233ecb7996635 (diff) | |
| download | tcl-a50dcb923a50640e31a433c872caa63630d8202d.zip tcl-a50dcb923a50640e31a433c872caa63630d8202d.tar.gz tcl-a50dcb923a50640e31a433c872caa63630d8202d.tar.bz2 | |
merge trunk
Diffstat (limited to 'generic/tclIntPlatDecls.h')
| -rw-r--r-- | generic/tclIntPlatDecls.h | 5 |
1 files changed, 4 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 |