diff options
| author | dkf <donal.k.fellows@manchester.ac.uk> | 2012-10-03 08:11:48 (GMT) |
|---|---|---|
| committer | dkf <donal.k.fellows@manchester.ac.uk> | 2012-10-03 08:11:48 (GMT) |
| commit | d7fd32ebdc04976287c78247d664efa442b3c5fe (patch) | |
| tree | 15adf3c75d8eed679221308126e83de6e2bfb15d /generic/tclStubInit.c | |
| parent | 948410d3929a4818d0fe0c6b7dfd918e4a98f35f (diff) | |
| parent | 301282088d6b7961c502f111c171db6e6a341ab9 (diff) | |
| download | tcl-d7fd32ebdc04976287c78247d664efa442b3c5fe.zip tcl-d7fd32ebdc04976287c78247d664efa442b3c5fe.tar.gz tcl-d7fd32ebdc04976287c78247d664efa442b3c5fe.tar.bz2 | |
merge trunk
Diffstat (limited to 'generic/tclStubInit.c')
| -rw-r--r-- | generic/tclStubInit.c | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c index ca2638c..75af3b7 100644 --- a/generic/tclStubInit.c +++ b/generic/tclStubInit.c @@ -53,6 +53,15 @@ static int TclSockMinimumBuffersOld(int sock, int size) } #endif + +#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 # define TclUnixCopyFile 0 @@ -89,12 +98,6 @@ void *TclWinGetTclInstance() return hInstance; } -unsigned short -TclWinNToHS(unsigned short ns) -{ - return ntohs(ns); -} - int TclWinSetSockOpt(SOCKET s, int level, int optname, const char *optval, int optlen) @@ -166,14 +169,6 @@ Tcl_WinTCharToUtf( string, len, dsPtr); } -#define TclMacOSXGetFileAttribute (int (*) (Tcl_Interp *, \ - int, Tcl_Obj *, Tcl_Obj **)) TclpCreateProcess -#define TclMacOSXMatchType (int (*) (Tcl_Interp *, const char *, \ - const char *, Tcl_StatBuf *, Tcl_GlobTypeData *)) TclpMakeFile -#define TclMacOSXNotifierAddRunLoopMode (void (*) (const void *)) TclpOpenFile -#define TclpLocaltime_unix (struct tm *(*) (const time_t *)) TclGetAndDetachPids -#define TclpGmtime_unix (struct tm *(*) (const time_t *)) TclpCloseFile - #else /* UNIX and MAC */ # define TclpLocaltime_unix TclpLocaltime # define TclpGmtime_unix TclpGmtime |