merge sebres-8-6-clock-speedup-cr2

1 files changed, 14 insertions, 6 deletions

diff --git a/generic/tclDate.h b/generic/tclDate.h
index 5033018..3544dee 100644
--- a/generic/tclDate.h
+++ b/generic/tclDate.h
@@ -148,6 +148,8 @@ typedef enum ClockMsgCtLiteral {
  * Structure containing the fields used in [clock format] and [clock scan]
  */
 
+#define CLF_CTZ		(1 << 4)
+
 typedef struct TclDateFields {
 
     /* Cacheable fields:	 */
@@ -170,8 +172,10 @@ typedef struct TclDateFields {
     int dayOfWeek;		/* Day of the week */
     int hour;			/* Hours of day (in-between time only calculation) */
     int minutes;		/* Minutes of hour (in-between time only calculation) */
-    int secondOfMin;		/* Seconds of minute (in-between time only calculation) */
-    int secondOfDay;		/* Seconds of day (in-between time only calculation) */
+    Tcl_WideInt secondOfMin;	/* Seconds of minute (in-between time only calculation) */
+    Tcl_WideInt secondOfDay;	/* Seconds of day (in-between time only calculation) */
+
+    int flags;			/* 0 or CLF_CTZ */
 
     /* Non cacheable fields:	 */
 
@@ -209,16 +213,16 @@ typedef struct DateInfo {
     int dateTimezone;
     int dateDSTmode;
 
-    int dateRelMonth;
-    int dateRelDay;
-    int dateRelSeconds;
+    Tcl_WideInt dateRelMonth;
+    Tcl_WideInt dateRelDay;
+    Tcl_WideInt dateRelSeconds;
 
     int dateMonthOrdinalIncr;
     int dateMonthOrdinal;
 
     int dateDayOrdinal;
 
-    int *dateRelPointer;
+    Tcl_WideInt *dateRelPointer;
 
     int dateSpaceCount;
     int dateDigitCount;
@@ -538,6 +542,10 @@ MODULE_SCOPE int    ClockMCSetIdx(ClockFmtScnCmdArgs *opts, int mcKey,
 
 /* tclClockFmt.c module declarations */
 
+
+MODULE_SCOPE char *
+	TclItoAw(char *buf, int val, char padchar, unsigned short int width);
+
 MODULE_SCOPE Tcl_Obj*
 		    ClockFrmObjGetLocFmtKey(Tcl_Interp *interp,
 			Tcl_Obj *objPtr);