From 415148e771a339b5873de21bcc7786eee4ea3548 Mon Sep 17 00:00:00 2001
From: ehouse <ehouse@0782aaa5-4710-0410-8820-a96bf9123855>
Date: Sat, 23 Sep 2006 20:40:36 +0000
Subject: [PATCH] tweaks to compile both standalone and for relay use. 
 Remember: Symbian code hasn't been run in over a year.

---
 xwords4/symbian/group/bldlinux.mk | 3 ++-
 xwords4/symbian/inc/xwappview.h   | 6 +++---
 xwords4/symbian/src/xwappview.cpp | 2 ++
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/xwords4/symbian/group/bldlinux.mk b/xwords4/symbian/group/bldlinux.mk
index 961688f52..9d10fe7c0 100644
--- a/xwords4/symbian/group/bldlinux.mk
+++ b/xwords4/symbian/group/bldlinux.mk
@@ -20,6 +20,7 @@ XWORDS_DIR = \"xwords_$(SERIES)\"
 include ../../common/config.mk
 
 #STANDALONE_ONLY ?= -DXWFEATURE_STANDALONE_ONLY
+BEYOND_IR = -DBEYOND_IR
 
 LIBS_ALLSERIES = \
 	$(EPOCTRGREL)/euser.lib \
@@ -125,7 +126,7 @@ CFLAGS += $(OPT) -I. -DUID3=0x$(U3) $(DEBUG_FLAGS) \
 	-D__LITTLE_ENDIAN -DKEYBOARD_NAV \
 	-DKEY_SUPPORT -DFEATURE_TRAY_EDIT -DNODE_CAN_4 \
 	$(STANDALONE_ONLY) -D$(SYMARCH) \
-	-DSYM_ARMI -DOS_INITS_DRAW -DBEYOND_IR \
+	-DSYM_ARMI -DOS_INITS_DRAW $(BEYOND_IR) \
 	$(INCDIR)
 
 # This violates the no-data rule.  Don't allow it for ARMI build.
diff --git a/xwords4/symbian/inc/xwappview.h b/xwords4/symbian/inc/xwappview.h
index 64ccb04ff..8c64e8d82 100644
--- a/xwords4/symbian/inc/xwappview.h
+++ b/xwords4/symbian/inc/xwappview.h
@@ -156,15 +156,15 @@ class CXWordsAppView : public CCoeControl
     static XWStreamCtxt*   sym_util_makeStreamFromAddr( XW_UtilCtxt* uc,
                                                         XP_U16 channelNo );
 
+    static void            sym_util_setTimer( XW_UtilCtxt* uc, 
+                                              XWTimerReason why, XP_U16 when,
+                                              TimerProc proc, void* closure );
 #ifdef BEYOND_IR
     static void            sym_util_listenPortChange( XW_UtilCtxt* uc, 
                                                       XP_U16 listenPort );
     static void            sym_util_addrChange( XW_UtilCtxt* uc, 
                                                 const CommsAddrRec* aOld,
                                                 const CommsAddrRec* aNew );
-    static void            sym_util_setTimer( XW_UtilCtxt* uc, 
-                                              XWTimerReason why, XP_U16 when,
-                                              TimerProc proc, void* closure );
 #endif
 
 #ifdef XWFEATURE_STANDALONE_ONLY
diff --git a/xwords4/symbian/src/xwappview.cpp b/xwords4/symbian/src/xwappview.cpp
index eeb1273ce..f8ce8d46f 100644
--- a/xwords4/symbian/src/xwappview.cpp
+++ b/xwords4/symbian/src/xwappview.cpp
@@ -398,6 +398,7 @@ sym_util_engineProgressCallback( XW_UtilCtxt* /*uc*/ )
 /*static*/ TInt
 CXWordsAppView::HeartbeatTimerCallback( TAny* closure )
 {
+#ifdef BEYOND_IR
     CXWordsAppView* self = (CXWordsAppView*)closure;
     self->iHBQueued = XP_FALSE;
 
@@ -405,6 +406,7 @@ CXWordsAppView::HeartbeatTimerCallback( TAny* closure )
     void* hbclosure;
     self->GetHeartbeatCB( &proc, &hbclosure );
     (*proc)( hbclosure, TIMER_HEARTBEAT );
+#endif
     return 0;
 }