Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-14 08:01:38 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix to compile when RELAY feature disabled

Browse source
This commit is contained in:
ehouse 2009-11-22 18:00:20 +00:00
parent 077b2c4789
commit 7fbd2bed45
1 changed files with 21 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
xwords4/common/comms.c
View file

@ -174,6 +174,9 @@ static XP_Bool send_via_relay( CommsCtxt* comms, XWRELAY_Cmd cmd,
XWHostID destID, void* data, int dlen ); XWHostID destID, void* data, int dlen );
static XWHostID getDestID( CommsCtxt* comms, XP_PlayerAddr channelNo ); static XWHostID getDestID( CommsCtxt* comms, XP_PlayerAddr channelNo );
static void set_reset_timer( CommsCtxt* comms ); static void set_reset_timer( CommsCtxt* comms );
# ifdef DEBUG
static const char* relayCmdToStr( XWRELAY_Cmd cmd );
# endif
#endif #endif
#if defined XWFEATURE_RELAY || defined COMMS_HEARTBEAT #if defined XWFEATURE_RELAY || defined COMMS_HEARTBEAT
static void setHeartbeatTimer( CommsCtxt* comms ); static void setHeartbeatTimer( CommsCtxt* comms );
@ -1036,10 +1039,10 @@ comms_resendAll( CommsCtxt* comms )
#ifdef XWFEATURE_RELAY #ifdef XWFEATURE_RELAY
# ifdef DEBUG # ifdef DEBUG
# define CASESTR(s) case s: return #s
static const char* static const char*
relayCmdToStr( XWRELAY_Cmd cmd ) relayCmdToStr( XWRELAY_Cmd cmd )
{ {
# define CASESTR(s) case s: return #s
switch( cmd ) { switch( cmd ) {
CASESTR( XWRELAY_NONE ); CASESTR( XWRELAY_NONE );
CASESTR( XWRELAY_GAME_CONNECT ); CASESTR( XWRELAY_GAME_CONNECT );
@ -1056,26 +1059,8 @@ relayCmdToStr( XWRELAY_Cmd cmd )
CASESTR( XWRELAY_MSG_TORELAY ); CASESTR( XWRELAY_MSG_TORELAY );
default: return "<unknown>"; default: return "<unknown>";
} }
}
const char*
ConnType2Str( CommsConnType typ )
{
switch( typ ) {
CASESTR(COMMS_CONN_NONE);
CASESTR( COMMS_CONN_IR );
CASESTR( COMMS_CONN_IP_DIRECT );
CASESTR( COMMS_CONN_RELAY );
CASESTR( COMMS_CONN_BT );
CASESTR( COMMS_CONN_SMS );
default:
XP_ASSERT(0);
}
return "<unknown>";
} }
# else # endif
# define relayCmdToStr( cmd )
# endif
static void static void
got_connect_cmd( CommsCtxt* comms, XWStreamCtxt* stream, got_connect_cmd( CommsCtxt* comms, XWStreamCtxt* stream,
@ -1629,6 +1614,22 @@ setHeartbeatTimer( CommsCtxt* comms )
#endif #endif
#ifdef DEBUG #ifdef DEBUG
const char*
ConnType2Str( CommsConnType typ )
{
switch( typ ) {
CASESTR(COMMS_CONN_NONE);
CASESTR( COMMS_CONN_IR );
CASESTR( COMMS_CONN_IP_DIRECT );
CASESTR( COMMS_CONN_RELAY );
CASESTR( COMMS_CONN_BT );
CASESTR( COMMS_CONN_SMS );
default:
XP_ASSERT(0);
}
return "<unknown>";
} /* ConnType2Str */
void void
comms_getStats( CommsCtxt* comms, XWStreamCtxt* stream ) comms_getStats( CommsCtxt* comms, XWStreamCtxt* stream )
{ {