summaryrefslogtreecommitdiffstats
path: root/generic/tcl.h
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2017-04-12 08:40:16 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2017-04-12 08:40:16 (GMT)
commit5a7bc1c76b9b56e6294cb6d11f537b54af3f85d3 (patch)
tree646fb74bc022eb2ac98654baeb2ddadbbee78c5a /generic/tcl.h
parentdf949f42797ed3af031e6b8af916f7759168e32a (diff)
parent4775249efa107caa7895328913957997cf0bc6d8 (diff)
downloadtcl-5a7bc1c76b9b56e6294cb6d11f537b54af3f85d3.zip
tcl-5a7bc1c76b9b56e6294cb6d11f537b54af3f85d3.tar.gz
tcl-5a7bc1c76b9b56e6294cb6d11f537b54af3f85d3.tar.bz2
merge trunk
Diffstat (limited to 'generic/tcl.h')
-rw-r--r--generic/tcl.h13
1 files changed, 5 insertions, 8 deletions
diff --git a/generic/tcl.h b/generic/tcl.h
index b1ddd72..5ff0742 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -419,10 +419,6 @@ typedef TCL_WIDE_INT_TYPE Tcl_WideInt;
typedef unsigned TCL_WIDE_INT_TYPE Tcl_WideUInt;
#ifdef TCL_WIDE_INT_IS_LONG
-# define Tcl_WideAsLong(val) ((long)(val))
-# define Tcl_LongAsWide(val) ((long)(val))
-# define Tcl_WideAsDouble(val) ((double)((long)(val)))
-# define Tcl_DoubleAsWide(val) ((long)((double)(val)))
# ifndef TCL_LL_MODIFIER
# define TCL_LL_MODIFIER "l"
# endif /* !TCL_LL_MODIFIER */
@@ -434,12 +430,13 @@ typedef unsigned TCL_WIDE_INT_TYPE Tcl_WideUInt;
# ifndef TCL_LL_MODIFIER
# define TCL_LL_MODIFIER "ll"
# endif /* !TCL_LL_MODIFIER */
-# define Tcl_WideAsLong(val) ((long)((Tcl_WideInt)(val)))
-# define Tcl_LongAsWide(val) ((Tcl_WideInt)((long)(val)))
-# define Tcl_WideAsDouble(val) ((double)((Tcl_WideInt)(val)))
-# define Tcl_DoubleAsWide(val) ((Tcl_WideInt)((double)(val)))
#endif /* TCL_WIDE_INT_IS_LONG */
+#define Tcl_WideAsLong(val) ((long)((Tcl_WideInt)(val)))
+#define Tcl_LongAsWide(val) ((Tcl_WideInt)((long)(val)))
+#define Tcl_WideAsDouble(val) ((double)((Tcl_WideInt)(val)))
+#define Tcl_DoubleAsWide(val) ((Tcl_WideInt)((double)(val)))
+
#if defined(_WIN32)
# ifdef __BORLANDC__
typedef struct stati64 Tcl_StatBuf;