diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-10-13 14:46:26 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-10-13 14:46:26 (GMT) |
| commit | 5015dd8a1f1a346f1105d9d31a21ab7c496746c9 (patch) | |
| tree | 98ca1707e6f2981d0b8068a0dcbf52e28e2c08d4 | |
| parent | 5abbd5b2da34caaafe3e827a34b30087fcd53808 (diff) | |
| download | tcl-5015dd8a1f1a346f1105d9d31a21ab7c496746c9.zip tcl-5015dd8a1f1a346f1105d9d31a21ab7c496746c9.tar.gz tcl-5015dd8a1f1a346f1105d9d31a21ab7c496746c9.tar.bz2 | |
Fix missing line (after manual merge-conflict). Fix compiler warning on linux64.
| -rw-r--r-- | generic/tcl.h | 6 | ||||
| -rw-r--r-- | generic/tclStringObj.c | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/generic/tcl.h b/generic/tcl.h index b847fef..5c32781 100644 --- a/generic/tcl.h +++ b/generic/tcl.h @@ -424,7 +424,11 @@ typedef unsigned TCL_WIDE_INT_TYPE Tcl_WideUInt; # define TCL_LL_MODIFIER "ll" #endif /* !TCL_LL_MODIFIER */ #ifndef TCL_Z_MODIFIER -# define TCL_Z_MODIFIER "" +# if defined(__GNUC__) && !defined(_WIN32) +# define TCL_Z_MODIFIER "z" +# else +# define TCL_Z_MODIFIER "" +# endif #endif /* !TCL_Z_MODIFIER */ #define Tcl_WideAsLong(val) ((long)((Tcl_WideInt)(val))) #define Tcl_LongAsWide(val) ((Tcl_WideInt)((long)(val))) diff --git a/generic/tclStringObj.c b/generic/tclStringObj.c index 6d065c3..98f4755 100644 --- a/generic/tclStringObj.c +++ b/generic/tclStringObj.c @@ -2028,6 +2028,7 @@ Tcl_AppendFormatToObj( if (gotHash || (ch == 'p')) { switch (ch) { case 'o': + Tcl_AppendToObj(segment, "0o", 2); segmentLimit -= 2; break; case 'p': |