Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-02-05 20:45:49 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix so IR-only multi-device build works again.

Browse source
This commit is contained in:
ehouse 2007-01-06 16:46:45 +00:00
parent bb0c8fbf75
commit c645534b83
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
common/comms.c
View file

@ -516,7 +516,6 @@ comms_setAddr( CommsCtxt* comms, const CommsAddrRec* addr )
#endif
} /* comms_setAddr */
#if defined XWFEATURE_RELAY || defined XWFEATURE_BLUETOOTH
void
comms_getInitialAddr( CommsAddrRec* addr )
{
@ -537,7 +536,6 @@ comms_getInitialAddr( CommsAddrRec* addr )
addr->conType = COMMS_CONN_BT;
#endif
} /* comms_getInitialAddr */
#endif
CommsConnType
comms_getConType( const CommsCtxt* comms )
@ -846,7 +844,7 @@ addressUnknown( CommsCtxt* comms, const CommsAddrRec* addr )
AddressRecord* rec;
CommsConnType conType = addr->conType;
XP_ASSERT( !!addr );
XP_ASSERT( !!addr || comms->addr.conType == COMMS_CONN_IR );
for ( rec = comms->recs; !!rec && unknown ; rec = rec->next ) {
XP_ASSERT( conType == rec->addr.conType );

2
palm/newgame.c
View file

@ -695,5 +695,7 @@ loadNewGameState( PalmAppGlobals* globals )
} else {
comms_getInitialAddr( &state->addr );
}
#elif defined XWFEATURE_IR
state->addr.conType = COMMS_CONN_IR;
#endif
} /* loadNewGameState */

2
palm/palmmain.c
View file

@ -1854,7 +1854,7 @@ initAndStartBoard( PalmAppGlobals* globals, XP_Bool newGame )
game_reset( MEMPOOL &globals->game, &globals->gameInfo,
&globals->util, newGameID, &globals->gState.cp,
palm_send, globals );
#if defined XWFEATURE_BLUETOOTH || defined XWFEATURE_RELAY
#if defined XWFEATURE_BLUETOOTH || defined XWFEATURE_RELAY || defined XWFEATURE_IR
if ( !!globals->game.comms ) {
comms_setAddr( globals->game.comms,
&globals->newGameState.addr );

2
palm/palmmain.h
View file

@ -203,7 +203,7 @@ typedef struct PalmNewGameState {
XP_Bool forwardChange;
Connectedness curServerHilite;
#if defined XWFEATURE_RELAY || defined XWFEATURE_BLUETOOTH
#if defined XWFEATURE_RELAY || defined XWFEATURE_BLUETOOTH || defined XWFEATURE_IR
CommsAddrRec addr;
XP_Bool connsSettingChanged;
#endif