summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordavygrvy <davygrvy@pobox.com>2004-01-09 20:55:26 (GMT)
committerdavygrvy <davygrvy@pobox.com>2004-01-09 20:55:26 (GMT)
commit0c9c935e197e3ae757f934bc2c80e8f7e5541403 (patch)
tree948fe5bd8d8b80528bdc44ea629b59c8b644b7f0
parentd96f663252a781bb11f0de481ae8aefde0011fa3 (diff)
downloadtcl-0c9c935e197e3ae757f934bc2c80e8f7e5541403.zip
tcl-0c9c935e197e3ae757f934bc2c80e8f7e5541403.tar.gz
tcl-0c9c935e197e3ae757f934bc2c80e8f7e5541403.tar.bz2
Renamed and deprecated #defines moved to within the #ifndef TCL_NO_DEPRECATED
block. This alows us to build Tcl to check for deprecated functions in use, such as panic() and Tcl_Ckalloc(). By request from DKF.
-rw-r--r--generic/tcl.h34
1 files changed, 18 insertions, 16 deletions
diff --git a/generic/tcl.h b/generic/tcl.h
index 238a2c7..83ad1bd 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -13,7 +13,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tcl.h,v 1.169 2003/12/23 02:39:08 davygrvy Exp $
+ * RCS: @(#) $Id: tcl.h,v 1.170 2004/01/09 20:55:26 davygrvy Exp $
*/
#ifndef _TCL
@@ -2239,28 +2239,30 @@ typedef struct Tcl_Config {
} Tcl_Config;
-/*
- * Deprecated Tcl procedures:
- */
#ifndef TCL_NO_DEPRECATED
+
+ /*
+ * Deprecated Tcl procedures:
+ */
+
# define Tcl_EvalObj(interp,objPtr) \
Tcl_EvalObjEx((interp),(objPtr),0)
# define Tcl_GlobalEvalObj(interp,objPtr) \
Tcl_EvalObjEx((interp),(objPtr),TCL_EVAL_GLOBAL)
-#endif
+ /*
+ * These function have been renamed. The old names are deprecated, but
+ * we define these macros for backwards compatibilty.
+ */
-/*
- * These function have been renamed. The old names are deprecated, but we
- * define these macros for backwards compatibilty.
- */
-#define Tcl_Ckalloc Tcl_Alloc
-#define Tcl_Ckfree Tcl_Free
-#define Tcl_Ckrealloc Tcl_Realloc
-#define Tcl_Return Tcl_SetResult
-#define Tcl_TildeSubst Tcl_TranslateFileName
-#define panic Tcl_Panic
-#define panicVA Tcl_PanicVA
+# define Tcl_Ckalloc Tcl_Alloc
+# define Tcl_Ckfree Tcl_Free
+# define Tcl_Ckrealloc Tcl_Realloc
+# define Tcl_Return Tcl_SetResult
+# define Tcl_TildeSubst Tcl_TranslateFileName
+# define panic Tcl_Panic
+# define panicVA Tcl_PanicVA
+#endif
/*