Fixing event clock width assumptions found by microsoft c.

Copied from Perforce
 Change: 179146
 ServerID: perforce.ravenbrook.com

3 files changed, 10 insertions, 8 deletions

diff --git a/mps/code/eventcnv.c b/mps/code/eventcnv.c
index 7a0b226b520..bd8be9701a4 100644
--- a/mps/code/eventcnv.c
+++ b/mps/code/eventcnv.c
@@ -190,7 +190,7 @@ static char *parseArgs(int argc, char *argv[])
 
 /* processEvent -- process event */
 
-static void processEvent(EventProc proc, Event event, Word etime)
+static void processEvent(EventProc proc, Event event, EventClock etime)
 {
   Res res;
 
@@ -288,17 +288,19 @@ static void reportEventResults(eventCountArray eventCounts)
 
 /* reportBucketResults -- report results of the current bucket */
 
-static void reportBucketResults(Word bucketLimit)
+static void reportBucketResults(EventClock bucketLimit)
 {
   switch (style) {
   case '\0':
-    printf("%8"PRIuLONGEST":", (ulongest_t)bucketLimit);
+    EVENT_CLOCK_PRINT(stdout, bucketLimit);
+    putchar(':');
     break;
   case 'L':
-    printf("(%"PRIXLONGEST, (ulongest_t)bucketLimit);
+    putchar('(');
+    EVENT_CLOCK_PRINT(stdout, bucketLimit);
     break;
   case 'C':
-    printf("%"PRIuLONGEST, (ulongest_t)bucketLimit);
+    EVENT_CLOCK_PRINT(stdout, bucketLimit);
     break;
   }
   if (reportEvents) {
diff --git a/mps/code/eventpro.c b/mps/code/eventpro.c
index 95f245dc588..21523825854 100644
--- a/mps/code/eventpro.c
+++ b/mps/code/eventpro.c
@@ -193,7 +193,7 @@ typedef struct symbolStruct *Symbol;
 
 typedef struct labelStruct {
   Word id;
-  Word time;
+  EventClock time;
   Addr addr;
 } labelStruct;
 typedef struct labelStruct *Label;
@@ -277,7 +277,7 @@ Res EventRead(Event *eventReturn, EventProc proc)
  * stuff in the future.
  */
 
-Res EventRecord(EventProc proc, Event event, Word etime)
+Res EventRecord(EventProc proc, Event event, EventClock etime)
 {
   Res res;
 
diff --git a/mps/code/eventpro.h b/mps/code/eventpro.h
index d9074d8638f..375eaec19c2 100644
--- a/mps/code/eventpro.h
+++ b/mps/code/eventpro.h
@@ -30,7 +30,7 @@ extern char *LabelText(EventProc proc, Word label);
 extern Res EventRead(Event *eventReturn, EventProc proc);
 extern void EventDestroy(EventProc proc, Event event);
 
-extern Res EventRecord(EventProc proc, Event event, Word etime);
+extern Res EventRecord(EventProc proc, Event event, EventClock etime);
 
 extern Res EventProcCreate(EventProc *procReturn, Bool partial,
                            EventProcReader reader, void *readerP);