summaryrefslogtreecommitdiffstats
path: root/generic/tclDecls.h
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2018-02-06 21:11:01 (GMT)
committerdgp <dgp@users.sourceforge.net>2018-02-06 21:11:01 (GMT)
commit90806d35252578f723b986809885e857c5aea380 (patch)
tree2b08278cadb82b497938a0cef00e60000c9737d3 /generic/tclDecls.h
parent24886887f902f1b5a09c094110c6a4e75afbcea2 (diff)
parent185cdc39c6ed70ecf07f8427be94091fffc05238 (diff)
downloadtcl-90806d35252578f723b986809885e857c5aea380.zip
tcl-90806d35252578f723b986809885e857c5aea380.tar.gz
tcl-90806d35252578f723b986809885e857c5aea380.tar.bz2
merge 8.7
Diffstat (limited to 'generic/tclDecls.h')
-rw-r--r--generic/tclDecls.h17
1 files changed, 11 insertions, 6 deletions
diff --git a/generic/tclDecls.h b/generic/tclDecls.h
index 3bef9c6..5a03288 100644
--- a/generic/tclDecls.h
+++ b/generic/tclDecls.h
@@ -3963,20 +3963,14 @@ extern const TclStubs *tclStubsPtr;
* possible. Tcl 9 must find a better solution, but that cannot be done
* without introducing a binary incompatibility.
*/
-# undef Tcl_DbNewLongObj
# undef Tcl_GetLongFromObj
-# undef Tcl_NewLongObj
-# undef Tcl_SetLongObj
# undef Tcl_ExprLong
# undef Tcl_ExprLongObj
# undef Tcl_UniCharNcmp
# undef Tcl_UtfNcmp
# undef Tcl_UtfNcasecmp
# undef Tcl_UniCharNcasecmp
-# define Tcl_DbNewLongObj ((Tcl_Obj*(*)(long,const char*,int))Tcl_DbNewWideIntObj)
# define Tcl_GetLongFromObj ((int(*)(Tcl_Interp*,Tcl_Obj*,long*))Tcl_GetWideIntFromObj)
-# define Tcl_NewLongObj ((Tcl_Obj*(*)(long))Tcl_NewWideIntObj)
-# define Tcl_SetLongObj ((void(*)(Tcl_Obj*,long))Tcl_SetWideIntObj)
# define Tcl_ExprLong TclExprLong
static inline int TclExprLong(Tcl_Interp *interp, const char *string, long *ptr){
int intValue;
@@ -4002,6 +3996,17 @@ extern const TclStubs *tclStubsPtr;
# endif
#endif
+#undef Tcl_NewLongObj
+#define Tcl_NewLongObj(value) Tcl_NewWideIntObj((long)(value))
+#undef Tcl_NewIntObj
+#define Tcl_NewIntObj(value) Tcl_NewWideIntObj((int)(value))
+#undef Tcl_DbNewLongObj
+#define Tcl_DbNewLongObj(value, file, line) Tcl_DbNewWideIntObj((long)(value), file, line)
+#undef Tcl_SetIntObj
+#define Tcl_SetIntObj(objPtr, value) Tcl_SetWideIntObj(objPtr, (int)(value))
+#undef Tcl_SetLongObj
+#define Tcl_SetLongObj(objPtr, value) Tcl_SetWideIntObj(objPtr, (long)(value))
+
/*
* Deprecated Tcl procedures:
*/