From d234fc637d5bd3ad8b998a96b15ff2b7091f17fa Mon Sep 17 00:00:00 2001 From: ehouse Date: Sun, 15 Oct 2006 14:09:17 +0000 Subject: [PATCH] make IR the default conn type on Palm, where it's been the only type until now. --- xwords4/common/comms.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/xwords4/common/comms.c b/xwords4/common/comms.c index c17706761..cacdb76db 100644 --- a/xwords4/common/comms.c +++ b/xwords4/common/comms.c @@ -520,10 +520,7 @@ comms_setAddr( CommsCtxt* comms, const CommsAddrRec* addr ) void comms_getInitialAddr( CommsAddrRec* addr ) { - /* default values; default is still IR where there's a choice */ -#if defined XWFEATURE_BLUETOOTH - addr->conType = COMMS_CONN_BT; /* for temporary ease in debugging */ -#elif defined XWFEATURE_RELAY +#if defined XWFEATURE_RELAY addr->conType = COMMS_CONN_RELAY; /* for temporary ease in debugging */ addr->u.ip_relay.ipAddr = 0L; /* force 'em to set it */ addr->u.ip_relay.port = 10999; @@ -532,6 +529,12 @@ comms_getInitialAddr( CommsAddrRec* addr ) XP_MEMCPY( addr->u.ip_relay.hostName, name, XP_STRLEN(name)+1 ); } addr->u.ip_relay.cookie[0] = '\0'; +#elif defined PLATFORM_PALM + /* default values; default is still IR where there's a choice, at least on + Palm... */ + addr->conType = COMMS_CONN_IR; +#else + addr->conType = COMMS_CONN_BT; #endif } /* comms_getInitialAddr */ #endif