summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2013-01-16 09:58:26 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2013-01-16 09:58:26 (GMT)
commit3bb6d870416fa3e858f780bf958bd188d13d58a2 (patch)
tree71f81c214601bb092fc71583a9b9a05a4938b58a
parent55804e86ba499482718af840b92ccf663eec5151 (diff)
parent3db744b60506ba65731f996d7e3dc5224d232bc9 (diff)
downloadtcl-3bb6d870416fa3e858f780bf958bd188d13d58a2.zip
tcl-3bb6d870416fa3e858f780bf958bd188d13d58a2.tar.gz
tcl-3bb6d870416fa3e858f780bf958bd188d13d58a2.tar.bz2
Allow win32 build with -DTCL_NO_DEPRECATED, just as the UNIX build, off by default.
Define Tcl_EvalObj and Tcl_GlobalEvalObj as macros, even when TCL_NO_DEPRECATED is defined, so Tk can benefit from it too.
-rw-r--r--ChangeLog8
-rw-r--r--generic/tcl.h7
-rw-r--r--generic/tclBasic.c2
-rw-r--r--generic/tclDecls.h12
-rw-r--r--win/Makefile.in7
5 files changed, 26 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index 434cbea..fa41721 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2013-01-16 Jan Nijtmans <nijtmans@users.sf.net>
+
+ * Makefile.in: Enable win32 build with -DTCL_NO_DEPRECATED, just
+ * generic/tcl.h: as the UNIX build. Define Tcl_EvalObj and
+ * generic/tclDecls.h: Tcl_GlobalEvalObj as macros, even when
+ * generic/tclBasic.c: TCL_NO_DEPRECATED is defined, so Tk
+ can benefit from it too.
+
2013-01-15 Jan Nijtmans <nijtmans@users.sf.net>
* generic/tclPort.h: [Bug 3598300]: unix: tcl.h does not include
diff --git a/generic/tcl.h b/generic/tcl.h
index 3003abf..7155453 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -2602,13 +2602,6 @@ EXTERN void Tcl_GetMemoryInfo(Tcl_DString *dsPtr);
*/
#ifndef TCL_NO_DEPRECATED
-# undef Tcl_EvalObj
-# define Tcl_EvalObj(interp,objPtr) \
- Tcl_EvalObjEx((interp),(objPtr),0)
-# undef Tcl_GlobalEvalObj
-# define Tcl_GlobalEvalObj(interp,objPtr) \
- Tcl_EvalObjEx((interp),(objPtr),TCL_EVAL_GLOBAL)
-
/*
* These function have been renamed. The old names are deprecated, but we
* define these macros for backwards compatibilty.
diff --git a/generic/tclBasic.c b/generic/tclBasic.c
index b511d07..6c53547 100644
--- a/generic/tclBasic.c
+++ b/generic/tclBasic.c
@@ -5849,7 +5849,6 @@ Tcl_Eval(
*----------------------------------------------------------------------
*/
-#undef Tcl_EvalObj
int
Tcl_EvalObj(
Tcl_Interp *interp,
@@ -5857,7 +5856,6 @@ Tcl_EvalObj(
{
return Tcl_EvalObjEx(interp, objPtr, 0);
}
-#undef Tcl_GlobalEvalObj
int
Tcl_GlobalEvalObj(
Tcl_Interp *interp,
diff --git a/generic/tclDecls.h b/generic/tclDecls.h
index 2801102..fe9ba2b 100644
--- a/generic/tclDecls.h
+++ b/generic/tclDecls.h
@@ -3803,4 +3803,16 @@ extern const TclStubs *tclStubsPtr;
#undef TCL_STORAGE_CLASS
#define TCL_STORAGE_CLASS DLLIMPORT
+/*
+ * Deprecated Tcl procedures:
+ */
+#if defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS)
+# undef Tcl_EvalObj
+# define Tcl_EvalObj(interp,objPtr) \
+ Tcl_EvalObjEx((interp),(objPtr),0)
+# undef Tcl_GlobalEvalObj
+# define Tcl_GlobalEvalObj(interp,objPtr) \
+ Tcl_EvalObjEx((interp),(objPtr),TCL_EVAL_GLOBAL)
+#endif
+
#endif /* _TCLDECLS */
diff --git a/win/Makefile.in b/win/Makefile.in
index d0e14c6..8582600 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -82,6 +82,11 @@ CFLAGS_OPTIMIZE = @CFLAGS_OPTIMIZE@
#CFLAGS = $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE)
CFLAGS = @CFLAGS@ @CFLAGS_DEFAULT@ -DUNICODE -D_UNICODE
+# To compile without backward compatibility and deprecated code uncomment the
+# following
+NO_DEPRECATED_FLAGS =
+#NO_DEPRECATED_FLAGS = -DTCL_NO_DEPRECATED
+
# To enable compilation debugging reverse the comment characters on one of the
# following lines.
COMPILE_DEBUG_FLAGS =
@@ -187,7 +192,7 @@ COPY = cp
CC_SWITCHES = ${CFLAGS} ${CFLAGS_WARNING} ${TCL_SHLIB_CFLAGS} -I"${ZLIB_DIR}" \
-I"${GENERIC_DIR_NATIVE}" -DTCL_TOMMATH -DMP_PREC=4 -I"${TOMMATH_DIR_NATIVE}" \
-I"${WIN_DIR_NATIVE}" ${AC_FLAGS} \
-${COMPILE_DEBUG_FLAGS}
+${COMPILE_DEBUG_FLAGS} ${NO_DEPRECATED_FLAGS}
CC_OBJNAME = @CC_OBJNAME@
CC_EXENAME = @CC_EXENAME@