summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2012-09-11 12:23:36 (GMT)
committerdgp <dgp@users.sourceforge.net>2012-09-11 12:23:36 (GMT)
commit63e5f2312a7cd7ff30d4361aa0a03f38d9bd90b6 (patch)
treec87723fbfda1903fe38740a57e4abec540921948
parentdbcf712181ecfbca0e5970eb3de6030a9664571c (diff)
parentdf2aa14a4b12e5a43e8e757268e95e153cc31fdb (diff)
downloadtcl-63e5f2312a7cd7ff30d4361aa0a03f38d9bd90b6.zip
tcl-63e5f2312a7cd7ff30d4361aa0a03f38d9bd90b6.tar.gz
tcl-63e5f2312a7cd7ff30d4361aa0a03f38d9bd90b6.tar.bz2
merge trunk
-rw-r--r--generic/tclStubInit.c8
-rw-r--r--win/Makefile.in2
2 files changed, 1 insertions, 9 deletions
diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c
index 0fc35d5..a8d74ee 100644
--- a/generic/tclStubInit.c
+++ b/generic/tclStubInit.c
@@ -169,14 +169,6 @@ Tcl_WinTCharToUtf(
string, len, dsPtr);
}
-#define TclMacOSXGetFileAttribute (int (*) (Tcl_Interp *, \
- int, Tcl_Obj *, Tcl_Obj **)) TclpCreateProcess
-#define TclMacOSXMatchType (int (*) (Tcl_Interp *, const char *, \
- const char *, Tcl_StatBuf *, Tcl_GlobTypeData *)) TclpMakeFile
-#define TclMacOSXNotifierAddRunLoopMode (void (*) (const void *)) TclpOpenFile
-#define TclpLocaltime_unix (struct tm *(*) (const time_t *)) TclGetAndDetachPids
-#define TclpGmtime_unix (struct tm *(*) (const time_t *)) TclpCloseFile
-
#else /* UNIX and MAC */
# define TclpLocaltime_unix TclpLocaltime
# define TclpGmtime_unix TclpGmtime
diff --git a/win/Makefile.in b/win/Makefile.in
index 392bd7a..4dbdbbd 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -786,7 +786,7 @@ test-packages: tcltest packages
pkg=`basename $$i`; \
if [ -f $(PKG_DIR)/$$pkg/Makefile ]; then \
echo "Testing package '$$pkg'"; \
- ( cd $(PKG_DIR)/$$pkg; $(MAKE) "LD_LIBRARY_PATH=$$builddir:${LD_LIBRARY_PATH}" "TCL_LIBRARY=${TCL_BUILDTIME_LIBRARY}" "TCLLIBPATH=$$builddir/pkgs" test "TCLSH_PROG=$$builddir/tcltest"; ) \
+ ( cd $(PKG_DIR)/$$pkg; $(MAKE) "LD_LIBRARY_PATH=$$builddir:${LD_LIBRARY_PATH}" "TCL_LIBRARY=${TCL_BUILDTIME_LIBRARY}" "TCLLIBPATH=$$builddir/pkgs" test "TCLSH_PROG=$$builddir/${TCLSH}"; ) \
fi; \
fi; \
done; \