diff options
author | andreask <andreask> | 2012-05-17 21:47:55 (GMT) |
---|---|---|
committer | andreask <andreask> | 2012-05-17 21:47:55 (GMT) |
commit | 4ebcb961515b7669f17d14bfe72d4eebd98f724f (patch) | |
tree | 1d1e5aff3b84beae7a1a01f1002b973777f8cd06 /generic/tclStubInit.c | |
parent | a3a3198dfe08f980f9895d03c2a31a6c302c21dc (diff) | |
parent | 6e977b903ee0e35f5b799abe1c8b3c902a5b5cef (diff) | |
download | tcl-4ebcb961515b7669f17d14bfe72d4eebd98f724f.zip tcl-4ebcb961515b7669f17d14bfe72d4eebd98f724f.tar.gz tcl-4ebcb961515b7669f17d14bfe72d4eebd98f724f.tar.bz2 |
Brought bugfix branch uptodate with head development.
Diffstat (limited to 'generic/tclStubInit.c')
-rw-r--r-- | generic/tclStubInit.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c index 8864a56..fdade56 100644 --- a/generic/tclStubInit.c +++ b/generic/tclStubInit.c @@ -165,10 +165,6 @@ Tcl_WinTCharToUtf( string, len, dsPtr); } -#define Tcl_MacOSXOpenBundleResources (int (*) ( \ - Tcl_Interp *, const char *, int, int, char *)) Tcl_WinUtfToTChar -#define Tcl_MacOSXOpenVersionedBundleResources (int (*) ( \ - Tcl_Interp *, const char *, const char *, int, int, char *)) Tcl_WinTCharToUtf #define TclMacOSXGetFileAttribute (int (*) (Tcl_Interp *, \ int, Tcl_Obj *, Tcl_Obj **)) TclpCreateProcess #define TclMacOSXMatchType (int (*) (Tcl_Interp *, const char *, \ @@ -594,11 +590,7 @@ static const TclIntPlatStubs tclIntPlatStubs = { static const TclPlatStubs tclPlatStubs = { TCL_STUB_MAGIC, 0, -#if !defined(__WIN32__) && !defined(MAC_OSX_TCL) /* UNIX */ - Tcl_MacOSXOpenBundleResources, /* 0 */ - Tcl_MacOSXOpenVersionedBundleResources, /* 1 */ -#endif /* UNIX */ -#ifdef __WIN32__ /* WIN */ +#if defined(__WIN32__) || defined(__CYGWIN__) /* WIN */ Tcl_WinUtfToTChar, /* 0 */ Tcl_WinTCharToUtf, /* 1 */ #endif /* WIN */ |