From c0b515457b6205a692ebf6822e1442b92f96539f Mon Sep 17 00:00:00 2001
From: ehouse <ehouse@0782aaa5-4710-0410-8820-a96bf9123855>
Date: Thu, 8 Feb 2007 15:17:23 +0000
Subject: [PATCH] Cleanup: compile warning and to make logging easier.

---
 xwords4/common/board.c | 10 +++++++---
 xwords4/common/comms.c |  2 ++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/xwords4/common/board.c b/xwords4/common/board.c
index 871bde484..f6ec60e67 100644
--- a/xwords4/common/board.c
+++ b/xwords4/common/board.c
@@ -2810,12 +2810,16 @@ board_handleKeyUp( BoardCtxt* board, XP_Key key, XP_Bool* pHandled )
 XP_Bool
 board_handleKey( BoardCtxt* board, XP_Key key, XP_Bool* handled )
 {
-    XP_Bool handled1, handled2;
-    XP_Bool draw = board_handleKeyDown( board, key, &handled1 );
+    XP_Bool handled1;
+    XP_Bool handled2;
+    XP_Bool draw;
+
+    draw = board_handleKeyDown( board, key, &handled1 );
     draw = board_handleKeyUp( board, key, &handled2 ) || draw;
     *handled = handled1 || handled2;
+
     return draw;
-}
+} /* board_handleKey */
 #endif /* KEY_SUPPORT */
 
 #ifdef KEYBOARD_NAV
diff --git a/xwords4/common/comms.c b/xwords4/common/comms.c
index 3690330bc..01b9bacf8 100644
--- a/xwords4/common/comms.c
+++ b/xwords4/common/comms.c
@@ -720,7 +720,9 @@ sendMsg( CommsCtxt* comms, MsgQueueElem* elem )
 {
     XP_S16 result = 0;
     XP_PlayerAddr channelNo;
+#if defined XWFEATURE_RELAY || defined XWFEATURE_BLUETOOTH
     CommsConnType conType = comms_getConType( comms );
+#endif
 
     channelNo = elem->channelNo;