From c0bdfb54c911696596a9d8c232f08fd47134896f Mon Sep 17 00:00:00 2001
From: ehouse <ehouse@0782aaa5-4710-0410-8820-a96bf9123855>
Date: Sun, 21 Aug 2005 14:18:56 +0000
Subject: [PATCH] constant name changed

---
 xwords4/linux/gtkmain.h | 2 +-
 xwords4/linux/main.h    | 4 ++--
 xwords4/palm/palmmain.c | 4 ++--
 xwords4/palm/palmmain.h | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/xwords4/linux/gtkmain.h b/xwords4/linux/gtkmain.h
index 6be3d443f..f7e2fe9ef 100644
--- a/xwords4/linux/gtkmain.h
+++ b/xwords4/linux/gtkmain.h
@@ -86,7 +86,7 @@ typedef struct GtkAppGlobals {
 
     ClientStreamRec clientRecs[MAX_NUM_PLAYERS];
 
-    guint timerSources[TIMER_NUM_PLUS_ONE - 1];
+    guint timerSources[NUM_TIMERS_PLUS_ONE - 1];
 
     CommonPrefs cp;
 
diff --git a/xwords4/linux/main.h b/xwords4/linux/main.h
index 15cb863a1..b6b89ea85 100644
--- a/xwords4/linux/main.h
+++ b/xwords4/linux/main.h
@@ -83,8 +83,8 @@ typedef struct CommonGlobals {
     SocketChangedFunc socketChanged;
     void* socketChangedClosure;
 
-    TimerProc timerProcs[TIMER_NUM_PLUS_ONE - 1];
-    void* timerClosures[TIMER_NUM_PLUS_ONE - 1];
+    TimerProc timerProcs[NUM_TIMERS_PLUS_ONE - 1];
+    void* timerClosures[NUM_TIMERS_PLUS_ONE - 1];
 } CommonGlobals;
 
 #endif
diff --git a/xwords4/palm/palmmain.c b/xwords4/palm/palmmain.c
index cc6287339..9f8d2d4d1 100644
--- a/xwords4/palm/palmmain.c
+++ b/xwords4/palm/palmmain.c
@@ -1385,7 +1385,7 @@ figureWaitTicks( PalmAppGlobals* globals )
 #endif
     } else if ( globals->timeRequested || globals->hintPending ) {
         result = 0;
-    } else if ( *timeForTimer( globals, &why, &when ) ) {
+    } else if ( timeForTimer( globals, &why, &when ) ) {
         result = when - TimGetTicks();
         if ( result < 0 ) {
             result = 0;
@@ -1563,7 +1563,7 @@ timeForTimer( PalmAppGlobals* globals, XWTimerReason* why, XP_U32* when )
     XP_U32 nextWhen = 0xFFFFFFFF;
     XP_Bool found;
 
-    for ( i = 1; i < TIMER_NUM_PLUS_ONE; ++i ) {
+    for ( i = 1; i < NUM_TIMERS_PLUS_ONE; ++i ) {
         if ( (globals->timerProcs[i] != NULL) && 
              (globals->timerFireAt[i] < nextWhen) ) {
             nextWhy = i;
diff --git a/xwords4/palm/palmmain.h b/xwords4/palm/palmmain.h
index a4c2bca5c..6d41385a2 100644
--- a/xwords4/palm/palmmain.h
+++ b/xwords4/palm/palmmain.h
@@ -306,9 +306,9 @@ struct PalmAppGlobals {
 
     struct ConnsDlgState* connState;
 
-    TimerProc timerProcs[TIMER_NUM_PLUS_ONE];
-    void* timerClosures[TIMER_NUM_PLUS_ONE];
-    XP_U32 timerFireAt[TIMER_NUM_PLUS_ONE];
+    TimerProc timerProcs[NUM_TIMERS_PLUS_ONE];
+    void* timerClosures[NUM_TIMERS_PLUS_ONE];
+    XP_U32 timerFireAt[NUM_TIMERS_PLUS_ONE];
 
 #ifdef BEYOND_IR
     NetLibStuff nlStuff;