diff options
| author | dgp <dgp@users.sourceforge.net> | 2012-08-27 12:40:40 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2012-08-27 12:40:40 (GMT) |
| commit | ecd5a8ed960d4cb3a9b0c87b4452037f72e395a9 (patch) | |
| tree | 39b75f2805620ade4b1fc3b5513023111b1107ea /generic | |
| parent | e6bb8f361290d568722685292e0aca56a53a6ad9 (diff) | |
| parent | b71431513bf64dcf7aeb53bd0788714c55171e90 (diff) | |
| download | tcl-ecd5a8ed960d4cb3a9b0c87b4452037f72e395a9.zip tcl-ecd5a8ed960d4cb3a9b0c87b4452037f72e395a9.tar.gz tcl-ecd5a8ed960d4cb3a9b0c87b4452037f72e395a9.tar.bz2 | |
merge trunk
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tclIntPlatDecls.h | 5 | ||||
| -rw-r--r-- | generic/tclStubInit.c | 9 |
2 files changed, 12 insertions, 2 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 7eb1788..0fc35d5 100644 --- a/generic/tclStubInit.c +++ b/generic/tclStubInit.c @@ -53,7 +53,14 @@ static int TclSockMinimumBuffersOld(int sock, int size) } #endif -#define TclWinNToHS ntohs + +#if defined(_WIN32) || defined(__CYGWIN__) +#undef TclWinNToHS +#define TclWinNToHS winNToHS +static unsigned short TclWinNToHS(unsigned short ns) { + return ntohs(ns); +} +#endif #ifdef __WIN32__ # define TclUnixWaitForFile 0 |