From 53b27c96c94c4f6f6150efc60a2826668cb78a8e Mon Sep 17 00:00:00 2001
From: ehouse <ehouse@0782aaa5-4710-0410-8820-a96bf9123855>
Date: Sun, 1 Feb 2009 16:20:18 +0000
Subject: [PATCH] Helps to compile platforms too before checking in...

---
 xwords4/palm/palmmain.c | 2 +-
 xwords4/relay/xwrelay.h | 5 +----
 xwords4/wince/cemain.c  | 6 +++---
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/xwords4/palm/palmmain.c b/xwords4/palm/palmmain.c
index 0ce25d480..a4f4774d4 100644
--- a/xwords4/palm/palmmain.c
+++ b/xwords4/palm/palmmain.c
@@ -3871,7 +3871,7 @@ palm_util_setTimer( XW_UtilCtxt* uc, XWTimerReason why,
     } else if ( why == TIMER_TIMERTICK ) {
         now += SysTicksPerSecond();
 #if defined XWFEATURE_RELAY || defined COMMS_HEARTBEAT
-    } else if ( why == TIMER_HEARTBEAT ) {
+    } else if ( why == TIMER_COMMS ) {
         now += (secsFromNow * SysTicksPerSecond());
 #endif
 #ifdef XWFEATURE_BLUETOOTH
diff --git a/xwords4/relay/xwrelay.h b/xwords4/relay/xwrelay.h
index 296e9ea69..09d614e5c 100644
--- a/xwords4/relay/xwrelay.h
+++ b/xwords4/relay/xwrelay.h
@@ -74,12 +74,9 @@ enum { XWRELAY_NONE             /* 0 is an illegal value */
        , XWRELAY_CONNECTDENIED
        /* The relay says go away.  Format: reason code: 1 */
 
-#ifdef RELAY_HEARTBEAT
        , XWRELAY_HEARTBEAT
        /* Sent in either direction.  Format: cookieID: 2; srcID: 1 */
-#else
-       , _XWRELAY_HEARTBEAT     /* don't use this */
-#endif
+
        , XWRELAY_MSG_FROMRELAY
        /* Sent from relay to device.  Format: cookieID: 2; src_hostID: 1;
           dest_hostID: 1; data <len-headerLen> */
diff --git a/xwords4/wince/cemain.c b/xwords4/wince/cemain.c
index 03b24b03c..e063f9f43 100755
--- a/xwords4/wince/cemain.c
+++ b/xwords4/wince/cemain.c
@@ -2014,7 +2014,7 @@ checkFireLateKeyTimer( CEAppGlobals* globals )
     XP_Bool drop = XP_FALSE;
     XWTimerReason whys[] = { TIMER_PENDOWN, TIMER_TIMERTICK
 #if defined XWFEATURE_RELAY || defined COMMS_HEARTBEAT
-                             , TIMER_HEARTBEAT
+                             , TIMER_COMMS
 #endif
     };
     XP_U32 now = GetCurrentTime();
@@ -2477,7 +2477,7 @@ WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
             why = (XWTimerReason)wParam;
             if ( why == TIMER_PENDOWN || why == TIMER_TIMERTICK
 #if defined XWFEATURE_RELAY || defined COMMS_HEARTBEAT
-                 || why == TIMER_HEARTBEAT
+                 || why == TIMER_COMMS
 #endif
                  ) {
                 XP_ASSERT( why < NUM_TIMERS_PLUS_ONE );
@@ -3185,7 +3185,7 @@ ce_util_setTimer( XW_UtilCtxt* uc, XWTimerReason why,
         howLong = 1000;          /* 1 second */
         break;
 #if defined XWFEATURE_RELAY || defined COMMS_HEARTBEAT
-    case TIMER_HEARTBEAT:
+    case TIMER_COMMS:
         howLong = when * 1000;
         break;
 #endif