summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2012-03-22 21:57:51 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2012-03-22 21:57:51 (GMT)
commite77556d943f0e745bb066779d9f775c92a281142 (patch)
tree41899d1913e505b2a2878374f5537ecfd41d1f3f
parent5a62da3750ddfade44c3113b96e1f5c7a0cef1f1 (diff)
parent7bfb05f7fb4dd46306021ae1e767db1edae74593 (diff)
downloadtcl-e77556d943f0e745bb066779d9f775c92a281142.zip
tcl-e77556d943f0e745bb066779d9f775c92a281142.tar.gz
tcl-e77556d943f0e745bb066779d9f775c92a281142.tar.bz2
merge trunk (fix OSX build error)
-rw-r--r--generic/tclIntPlatDecls.h6
-rw-r--r--generic/tclStubInit.c2
2 files changed, 1 insertions, 7 deletions
diff --git a/generic/tclIntPlatDecls.h b/generic/tclIntPlatDecls.h
index 8350781..192005c 100644
--- a/generic/tclIntPlatDecls.h
+++ b/generic/tclIntPlatDecls.h
@@ -512,10 +512,4 @@ extern const 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)
-#endif
-
#endif /* _TCLINTPLATDECLS */
diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c
index eab51a8..da899f4 100644
--- a/generic/tclStubInit.c
+++ b/generic/tclStubInit.c
@@ -89,7 +89,7 @@ Tcl_WinTCharToUtf(string, len, dsPtr)
#define Tcl_MacOSXOpenVersionedBundleResources (int (*) _ANSI_ARGS_(( \
Tcl_Interp *, CONST char *, CONST char *, int, int, char *))) Tcl_WinTCharToUtf
-#elif !defined(__WIN32__) && !defined(MAC_OSX_TCL) /* UNIX */
+#elif !defined(__WIN32__) /* UNIX and MAC */
# define TclWinGetPlatformId (int (*)()) TclpCreateTempFile
# ifndef MAC_OSX_TCL
# define Tcl_MacOSXOpenBundleResources 0