diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2018-08-19 09:33:34 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2018-08-19 09:33:34 (GMT) |
| commit | e588745d77e39a04cd197b6ee4539ae5b8811256 (patch) | |
| tree | 715ca8abc4170c7ae9fa01a174a931322f45a6f1 /generic/tclInt.h | |
| parent | b3993adcfb19f12c2fe6accbaec020a9599a6294 (diff) | |
| parent | b3fc99501ec94bdc4c05736825c08a050cf8046d (diff) | |
| download | tcl-e588745d77e39a04cd197b6ee4539ae5b8811256.zip tcl-e588745d77e39a04cd197b6ee4539ae5b8811256.tar.gz tcl-e588745d77e39a04cd197b6ee4539ae5b8811256.tar.bz2 | |
Re-base branch "all-wideint" to core-8-branch. Still WIP
Diffstat (limited to 'generic/tclInt.h')
| -rw-r--r-- | generic/tclInt.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/generic/tclInt.h b/generic/tclInt.h index 5379396..038fa88 100644 --- a/generic/tclInt.h +++ b/generic/tclInt.h @@ -2497,7 +2497,7 @@ typedef struct List { #else #define TclGetLongFromObj(interp, objPtr, longPtr) \ (((objPtr)->typePtr == &tclIntType \ - && (objPtr)->internalRep.wideValue >= -(Tcl_WideInt)(ULONG_MAX) \ + && (objPtr)->internalRep.wideValue >= (Tcl_WideInt)(LONG_MIN) \ && (objPtr)->internalRep.wideValue <= (Tcl_WideInt)(ULONG_MAX)) \ ? ((*(longPtr) = (long)(objPtr)->internalRep.wideValue), TCL_OK) \ : Tcl_GetLongFromObj((interp), (objPtr), (longPtr))) @@ -2505,7 +2505,7 @@ typedef struct List { #define TclGetIntFromObj(interp, objPtr, intPtr) \ (((objPtr)->typePtr == &tclIntType \ - && (objPtr)->internalRep.wideValue >= -(Tcl_WideInt)(UINT_MAX) \ + && (objPtr)->internalRep.wideValue >= (Tcl_WideInt)(INT_MIN) \ && (objPtr)->internalRep.wideValue <= (Tcl_WideInt)(UINT_MAX)) \ ? ((*(intPtr) = (int)(objPtr)->internalRep.wideValue), TCL_OK) \ : Tcl_GetIntFromObj((interp), (objPtr), (intPtr))) @@ -2709,8 +2709,11 @@ typedef struct ProcessGlobalValue { *---------------------------------------------------------------------- */ -#define TCL_NUMBER_LONG 1 -#define TCL_NUMBER_WIDE 2 +#define TCL_NUMBER_INT 2 +#if TCL_MAJOR_VERSION < 9 +# define TCL_NUMBER_LONG 1 /* deprecated, not used any more */ +# define TCL_NUMBER_WIDE TCL_NUMBER_INT /* deprecated */ +#endif #define TCL_NUMBER_BIG 3 #define TCL_NUMBER_DOUBLE 4 #define TCL_NUMBER_NAN 5 |