summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--generic/tclInt.decls121
-rw-r--r--generic/tclIntPlatDecls.h32
2 files changed, 30 insertions, 123 deletions
diff --git a/generic/tclInt.decls b/generic/tclInt.decls
index b0bc73e..cb01b22 100644
--- a/generic/tclInt.decls
+++ b/generic/tclInt.decls
@@ -18,7 +18,6 @@ library tcl
# Define the unsupported generic interfaces.
interface tclInt
-scspec EXTERN
# Declare each of the functions in the unsupported internal Tcl
# interface. These interfaces are allowed to changed between versions.
@@ -746,7 +745,7 @@ declare 177 {
# const char *file, int line)
#}
-# TclpGmtime and TclpLocaltime promoted to the interface from unix
+# TclpGmtime and TclpLocaltime promoted to the generic interface from unix
declare 182 {
struct tm *TclpLocaltime(const time_t *clock)
@@ -999,7 +998,6 @@ declare 249 {
char* TclDoubleDigits(double dv, int ndigits, int flags,
int* decpt, int* signum, char** endPtr)
}
-
# TIP #285: Script cancellation support.
declare 250 {
void TclSetSlaveCancelFlags(Tcl_Interp *interp, int flags, int force)
@@ -1012,117 +1010,6 @@ declare 250 {
interface tclIntPlat
-########################
-# Mac specific internals
-
-declare 0 mac {
- VOID *TclpSysAlloc(long size, int isBin)
-}
-declare 1 mac {
- void TclpSysFree(VOID *ptr)
-}
-declare 2 mac {
- VOID *TclpSysRealloc(VOID *cp, unsigned int size)
-}
-declare 3 mac {
- void TclpExit(int status)
-}
-
-# Prototypes for functions found in the tclMacUtil.c compatability library.
-
-declare 4 mac {
- int FSpGetDefaultDir(FSSpecPtr theSpec)
-}
-declare 5 mac {
- int FSpSetDefaultDir(FSSpecPtr theSpec)
-}
-declare 6 mac {
- OSErr FSpFindFolder(short vRefNum, OSType folderType,
- Boolean createFolder, FSSpec *spec)
-}
-declare 7 mac {
- void GetGlobalMouseTcl(Point *mouse)
-}
-
-# The following routines are utility functions in Tcl. They are exported
-# here because they are needed in Tk. They are not officially supported,
-# however. The first set are from the MoreFiles package.
-
-declare 8 mac {
- pascal OSErr FSpGetDirectoryIDTcl(CONST FSSpec *spec, long *theDirID,
- Boolean *isDirectory)
-}
-declare 9 mac {
- pascal short FSpOpenResFileCompatTcl(CONST FSSpec *spec,
- SignedByte permission)
-}
-declare 10 mac {
- pascal void FSpCreateResFileCompatTcl(CONST FSSpec *spec, OSType creator,
- OSType fileType, ScriptCode scriptTag)
-}
-
-# Like the MoreFiles routines these fix problems in the standard
-# Mac calls. These routines are from tclMacUtils.h.
-
-declare 11 mac {
- int FSpLocationFromPath(int length, CONST char *path, FSSpecPtr theSpec)
-}
-declare 12 mac {
- OSErr FSpPathFromLocation(FSSpecPtr theSpec, int *length,
- Handle *fullPath)
-}
-
-# Prototypes of Mac only internal functions.
-
-declare 13 mac {
- void TclMacExitHandler(void)
-}
-declare 14 mac {
- void TclMacInitExitToShell(int usePatch)
-}
-declare 15 mac {
- OSErr TclMacInstallExitToShellPatch(ExitToShellProcPtr newProc)
-}
-declare 16 mac {
- int TclMacOSErrorToPosixError(int error)
-}
-declare 17 mac {
- void TclMacRemoveTimer(VOID *timerToken)
-}
-declare 18 mac {
- VOID *TclMacStartTimer(long ms)
-}
-declare 19 mac {
- int TclMacTimerExpired(VOID *timerToken)
-}
-declare 20 mac {
- int TclMacRegisterResourceFork(short fileRef, Tcl_Obj *tokenPtr,
- int insert)
-}
-declare 21 mac {
- short TclMacUnRegisterResourceFork(char *tokenPtr, Tcl_Obj *resultPtr)
-}
-declare 22 mac {
- int TclMacCreateEnv(void)
-}
-declare 23 mac {
- FILE *TclMacFOpenHack(CONST char *path, CONST char *mode)
-}
-# Replaced in 8.1 by TclpReadLink:
-# declare 24 mac {
-# int TclMacReadlink(char *path, char *buf, int size)
-# }
-declare 24 mac {
- char *TclpGetTZName(int isdst)
-}
-declare 25 mac {
- int TclMacChmod(CONST char *path, int mode)
-}
-# version of FSpLocationFromPath that doesn't resolve the last path component
-declare 26 mac {
- int FSpLLocationFromPath(int length, CONST char *path, FSSpecPtr theSpec)
-}
-
################################
# Windows specific functions
@@ -1217,7 +1104,7 @@ declare 23 win {
declare 24 win {
char *TclWinNoBackslash(char *path)
}
-# replaced by TclGetPlatform
+# replaced by generic TclGetPlatform
#declare 25 win {
# TclPlatformType *TclWinGetPlatform(void)
#}
@@ -1295,7 +1182,7 @@ declare 10 unix {
Tcl_DirEntry *TclpReaddir(DIR *dir)
}
# Slots 11 and 12 are forwarders for functions that were promoted to
-# Stubs
+# generic Stubs
# On cygwin, this is actually a reference to TclGetAndDetachPids
declare 11 unix {
struct tm *TclpLocaltime_unix(const time_t *clock)
@@ -1339,7 +1226,7 @@ declare 18 {unix macosx} {
}
#On cygwin, TclpOpenFile is here
declare 19 {unix macosx} {
- void TclMacOSXNotifierAddRunLoopMode(const void *runLoopMode)
+ void TclMacOSXNotifierAddRunLoopMode(const void *runLoopMode)
}
declare 20 unix {
void TclWinAddProcess(void *hProcess, unsigned long id)
diff --git a/generic/tclIntPlatDecls.h b/generic/tclIntPlatDecls.h
index f5cece4..5d3e2ab 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
/*
@@ -574,4 +574,24 @@ extern const TclIntPlatStubs *tclIntPlatStubsPtr;
#undef TclpLocaltime_unix
#undef TclpGmtime_unix
+#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)
+# endif
+#endif
+
#endif /* _TCLINTPLATDECLS */