summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2017-04-06 11:13:22 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2017-04-06 11:13:22 (GMT)
commit0c57a249bb5672ca4ceafe4353d9f6a76a0d4505 (patch)
tree55e16945b507be6af6378e5b57a741a93881574a /generic
parent4f20b26224ed27d2a75607416198e615bee7e128 (diff)
downloadtcl-0c57a249bb5672ca4ceafe4353d9f6a76a0d4505.zip
tcl-0c57a249bb5672ca4ceafe4353d9f6a76a0d4505.tar.gz
tcl-0c57a249bb5672ca4ceafe4353d9f6a76a0d4505.tar.bz2
If compiled with TCL_NO_DEPRECATED, the functions TclpGetDate/TclpLocaltime/TclpGmtime can be removed: They are internal and not used for anything any more.
Diffstat (limited to 'generic')
-rw-r--r--generic/tclBasic.c2
-rw-r--r--generic/tclStubInit.c22
2 files changed, 13 insertions, 11 deletions
diff --git a/generic/tclBasic.c b/generic/tclBasic.c
index 8e816a5..b29e19e 100644
--- a/generic/tclBasic.c
+++ b/generic/tclBasic.c
@@ -5880,7 +5880,6 @@ Tcl_Eval(
(void) Tcl_GetStringResult(interp);
return code;
}
-#endif /* TCL_NO_DEPRECATED */
/*
*----------------------------------------------------------------------
@@ -5915,6 +5914,7 @@ Tcl_GlobalEvalObj(
{
return Tcl_EvalObjEx(interp, objPtr, TCL_EVAL_GLOBAL);
}
+#endif /* TCL_NO_DEPRECATED */
/*
*----------------------------------------------------------------------
diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c
index 7957389..3f0a8ff 100644
--- a/generic/tclStubInit.c
+++ b/generic/tclStubInit.c
@@ -287,17 +287,9 @@ static int formatInt(char *buffer, int n){
}
#define TclFormatInt (int(*)(char *, long))formatInt
-#endif
+#endif /* TCL_WIDE_INT_IS_LONG */
-#else /* UNIX and MAC */
-# ifdef TCL_NO_DEPRECATED
-# define TclpLocaltime_unix 0
-# define TclpGmtime_unix 0
-# else
-# define TclpLocaltime_unix TclpLocaltime
-# define TclpGmtime_unix TclpGmtime
-# endif
-#endif
+#endif /* __CYGWIN__ */
#ifdef TCL_NO_DEPRECATED
# define Tcl_SeekOld 0
@@ -351,9 +343,19 @@ static int formatInt(char *buffer, int n){
# define Tcl_EvalObj 0
# undef Tcl_GlobalEvalObj
# define Tcl_GlobalEvalObj 0
+# undef TclpGetDate
+# define TclpGetDate 0
+# undef TclpLocaltime
+# define TclpLocaltime 0
+# undef TclpGmtime
+# define TclpGmtime 0
+# define TclpLocaltime_unix 0
+# define TclpGmtime_unix 0
#else /* TCL_NO_DEPRECATED */
# define Tcl_SeekOld seekOld
# define Tcl_TellOld tellOld
+# define TclpLocaltime_unix TclpLocaltime
+# define TclpGmtime_unix TclpGmtime
static int
seekOld(