diff options
author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-07-09 09:30:34 (GMT) |
---|---|---|
committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-07-09 09:30:34 (GMT) |
commit | 7e1ad97eceebf463302d6602375e5cef77f0bc95 (patch) | |
tree | 70b3467f6ee480e313f93e581c6dd9cb7d4b61a1 | |
parent | 17ffd6902101268bd8cc522ed62049279e2894d5 (diff) | |
parent | eaf7ff26235ed9b4fd65eb3ff15c2b415f540d0d (diff) | |
download | tcl-bug_1712098.zip tcl-bug_1712098.tar.gz tcl-bug_1712098.tar.bz2 |
rebasebug_1712098
-rw-r--r-- | generic/tcl.decls | 3 | ||||
-rw-r--r-- | generic/tclPlatDecls.h | 10 | ||||
-rw-r--r-- | generic/tclStubInit.c | 1 | ||||
-rw-r--r-- | macosx/tclMacOSXNotify.c | 6 |
4 files changed, 17 insertions, 3 deletions
diff --git a/generic/tcl.decls b/generic/tcl.decls index 1829249..0ade898 100644 --- a/generic/tcl.decls +++ b/generic/tcl.decls @@ -2362,6 +2362,9 @@ declare 1 macosx { const char *bundleName, const char *bundleVersion, int hasResourceFile, int maxPathLen, char *libraryPath) } +declare 2 macosx { + void Tcl_MacOSXNotifierAddRunLoopMode(const void *runLoopMode) +} ############################################################################## diff --git a/generic/tclPlatDecls.h b/generic/tclPlatDecls.h index e9b92fe..7d64e04 100644 --- a/generic/tclPlatDecls.h +++ b/generic/tclPlatDecls.h @@ -21,6 +21,10 @@ # endif #endif +#if defined( MAC_OSX_TCL) && !defined(USE_TCL_STUBS) +#define Tcl_MacOSXNotifierAddRunLoopMode TclMacOSXNotifierAddRunLoopMode +#endif + /* * WARNING: This file is automatically generated by the tools/genStubs.tcl * script. Any modifications to the function declarations below should be made @@ -65,6 +69,9 @@ EXTERN int Tcl_MacOSXOpenVersionedBundleResources( const char *bundleVersion, int hasResourceFile, int maxPathLen, char *libraryPath); +/* 2 */ +EXTERN void Tcl_MacOSXNotifierAddRunLoopMode( + const void *runLoopMode); #endif /* MACOSX */ typedef struct TclPlatStubs { @@ -78,6 +85,7 @@ typedef struct TclPlatStubs { #ifdef MAC_OSX_TCL /* MACOSX */ int (*tcl_MacOSXOpenBundleResources) (Tcl_Interp *interp, const char *bundleName, int hasResourceFile, int maxPathLen, char *libraryPath); /* 0 */ int (*tcl_MacOSXOpenVersionedBundleResources) (Tcl_Interp *interp, const char *bundleName, const char *bundleVersion, int hasResourceFile, int maxPathLen, char *libraryPath); /* 1 */ + void (*tcl_MacOSXNotifierAddRunLoopMode) (const void *runLoopMode); /* 2 */ #endif /* MACOSX */ } TclPlatStubs; @@ -106,6 +114,8 @@ extern const TclPlatStubs *tclPlatStubsPtr; (tclPlatStubsPtr->tcl_MacOSXOpenBundleResources) /* 0 */ #define Tcl_MacOSXOpenVersionedBundleResources \ (tclPlatStubsPtr->tcl_MacOSXOpenVersionedBundleResources) /* 1 */ +#define Tcl_MacOSXNotifierAddRunLoopMode \ + (tclPlatStubsPtr->tcl_MacOSXNotifierAddRunLoopMode) /* 2 */ #endif /* MACOSX */ #endif /* defined(USE_TCL_STUBS) */ diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c index 782bbdf..7b6a707 100644 --- a/generic/tclStubInit.c +++ b/generic/tclStubInit.c @@ -669,6 +669,7 @@ static const TclPlatStubs tclPlatStubs = { #ifdef MAC_OSX_TCL /* MACOSX */ Tcl_MacOSXOpenBundleResources, /* 0 */ Tcl_MacOSXOpenVersionedBundleResources, /* 1 */ + Tcl_MacOSXNotifierAddRunLoopMode, /* 2 */ #endif /* MACOSX */ }; diff --git a/macosx/tclMacOSXNotify.c b/macosx/tclMacOSXNotify.c index ef80192..2cb58f3 100644 --- a/macosx/tclMacOSXNotify.c +++ b/macosx/tclMacOSXNotify.c @@ -593,7 +593,7 @@ Tcl_InitNotifier(void) /* *---------------------------------------------------------------------- * - * TclMacOSXNotifierAddRunLoopMode -- + * Tcl_MacOSXNotifierAddRunLoopMode -- * * Add the tcl notifier RunLoop source, observer and timer (if any) * to the given RunLoop mode. @@ -2018,10 +2018,10 @@ AtForkChild(void) #else /* HAVE_COREFOUNDATION */ void -TclMacOSXNotifierAddRunLoopMode( +Tcl_MacOSXNotifierAddRunLoopMode( const void *runLoopMode) { - Tcl_Panic("TclMacOSXNotifierAddRunLoopMode: " + Tcl_Panic("Tcl_MacOSXNotifierAddRunLoopMode: " "Tcl not built with CoreFoundation support"); } |