diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-03-26 08:06:44 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-03-26 08:06:44 (GMT) |
| commit | c3d06984b8539b9d384792dd086de60fff9d019f (patch) | |
| tree | f0fe328a45a2f18dace82a0231d37d92cd84bf5b /generic/tclIntPlatDecls.h | |
| parent | 2361a87fc4e600622f0aee538f97b49a0c1e4cf8 (diff) | |
| parent | 6edbdf3817936bfb8f515d5f8c89088d686a926a (diff) | |
| download | tcl-c3d06984b8539b9d384792dd086de60fff9d019f.zip tcl-c3d06984b8539b9d384792dd086de60fff9d019f.tar.gz tcl-c3d06984b8539b9d384792dd086de60fff9d019f.tar.bz2 | |
3 missing stub macros for cygwin
fix merge problem from Tcl 8.4 (old mac stub table got accidently back)
Diffstat (limited to 'generic/tclIntPlatDecls.h')
| -rw-r--r-- | generic/tclIntPlatDecls.h | 45 |
1 files changed, 35 insertions, 10 deletions
diff --git a/generic/tclIntPlatDecls.h b/generic/tclIntPlatDecls.h index 8375058..0e9200b 100644 --- a/generic/tclIntPlatDecls.h +++ b/generic/tclIntPlatDecls.h @@ -25,13 +25,13 @@ #endif #if !defined(__WIN32__) /* UNIX */ -EXTERN int TclpCreateProcess _ANSI_ARGS_((Tcl_Interp *interp, +EXTERN int TclpCreateProcess(Tcl_Interp *interp, int argc, CONST char **argv, TclFile inputFile, - TclFile outputFile, TclFile errorFile, Tcl_Pid *pidPtr)); -EXTERN TclFile TclpMakeFile _ANSI_ARGS_((Tcl_Channel channel, - int direction)); -EXTERN TclFile TclpOpenFile _ANSI_ARGS_((CONST char *fname, - int mode)); + TclFile outputFile, TclFile errorFile, Tcl_Pid *pidPtr); +EXTERN TclFile TclpMakeFile(Tcl_Channel channel, + int direction); +EXTERN TclFile TclpOpenFile(CONST char *fname, + int mode); #endif /* @@ -974,10 +974,35 @@ extern TclIntPlatStubs *tclIntPlatStubsPtr; #undef TclpLocaltime_unix #undef TclpGmtime_unix -#if !defined(__WIN32__) && !defined(__CYGWIN__) && defined(USE_TCL_STUBS) -#undef TclpCreateTempFile -#define TclpCreateTempFile \ - ((TclFile (*)_ANSI_ARGS_((CONST char *))) tclIntPlatStubsPtr->tclWinGetPlatformId) +#if !defined(__WIN32__) && defined(USE_TCL_STUBS) +# ifdef __CYGWIN__ +# define TclpCreateProcess ((int (*) _ANSI_ARGS_((Tcl_Interp *, int, \ + CONST char **, TclFile, TclFile, TclFile, Tcl_Pid *))) \ + tclIntPlatStubsPtr->tclMacOSXGetFileAttribute) +# define TclpMakeFile ((TclFile (*) _ANSI_ARGS_((Tcl_Channel channel, \ + int direction))) tclIntPlatStubsPtr->tclMacOSXMatchType) +# define TclpOpenFile ((TclFile (*) _ANSI_ARGS_((CONST char *, int))) \ + tclIntPlatStubsPtr->tclMacOSXNotifierAddRunLoopMode) +# else +# define TclpCreateProcess ((int (*) _ANSI_ARGS_((Tcl_Interp *, int, \ + CONST char **, TclFile, TclFile, TclFile, Tcl_Pid *))) \ + tclIntPlatStubsPtr->tclWinGetTclInstance) +# define TclpMakeFile ((TclFile (*) _ANSI_ARGS_((Tcl_Channel channel, \ + int direction))) tclIntPlatStubsPtr->tclWinNToHS) +# define TclpOpenFile ((TclFile (*) _ANSI_ARGS_((CONST char *, int))) \ + tclIntPlatStubsPtr->tclWinNToHS) + +# undef TclpCreateTempFile +# undef TclGetAndDetachPids +# undef TclpCloseFile + +# define TclpCreateTempFile ((TclFile (*) _ANSI_ARGS_((CONST char *))) \ + tclIntPlatStubsPtr->tclWinGetPlatformId) +# define TclGetAndDetachPids ((void (*) _ANSI_ARGS_((Tcl_Interp *, Tcl_Channel))) \ + tclIntPlatStubsPtr->tclWinConvertError) +# define TclpCloseFile ((int (*) _ANSI_ARGS_((TclFile))) \ + tclIntPlatStubsPtr->tclWinConvertWSAError) +# endif #endif #endif /* _TCLINTPLATDECLS */ |