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

fix compilation where DEBUG not set

Browse source
This commit is contained in:
Eric House 2020-04-26 13:49:54 -07:00
parent 9fa23af6e0
commit 182b8e0489
4 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
xwords4/common/comms.c
View file

@ -235,7 +235,7 @@ static void logAddrs( const CommsCtxt* comms, XWEnv xwe,
# else # else
# define printQueue( comms ) # define printQueue( comms )
# define logAddr( comms, addr, caller) # define logAddr( comms, xwe, addr, caller)
# define logAddrs( comms, caller ) # define logAddrs( comms, caller )
# endif # endif
#endif #endif
@ -420,7 +420,7 @@ cleanupAddrRecs( CommsCtxt* comms )
} /* cleanupAddrRecs */ } /* cleanupAddrRecs */
static void static void
removeAddrRec( CommsCtxt* comms, XWEnv xwe, AddressRecord* rec ) removeAddrRec( CommsCtxt* comms, XWEnv XP_UNUSED_DBG(xwe), AddressRecord* rec )
{ {
XP_LOGF( TAGFMT(%p), TAGPRMS, rec ); XP_LOGF( TAGFMT(%p), TAGPRMS, rec );
#ifdef DEBUG #ifdef DEBUG
@ -891,8 +891,8 @@ addrToStream( XWStreamCtxt* stream, const CommsAddrRec* addrP )
} }
void void
comms_writeToStream( CommsCtxt* comms, XWEnv xwe, XWStreamCtxt* stream, comms_writeToStream( CommsCtxt* comms, XWEnv XP_UNUSED_DBG(xwe),
XP_U16 saveToken ) XWStreamCtxt* stream, XP_U16 saveToken )
{ {
XP_U16 nAddrRecs; XP_U16 nAddrRecs;
AddressRecord* rec; AddressRecord* rec;
@ -1023,7 +1023,8 @@ comms_augmentHostAddr( CommsCtxt* comms, XWEnv xwe, const CommsAddrRec* addr )
} /* comms_setHostAddr */ } /* comms_setHostAddr */
void void
comms_getAddrs( const CommsCtxt* comms, XWEnv xwe, CommsAddrRec addr[], XP_U16* nRecs ) comms_getAddrs( const CommsCtxt* comms, XWEnv XP_UNUSED_DBG(xwe),
CommsAddrRec addr[], XP_U16* nRecs )
{ {
AddressRecord* recs; AddressRecord* recs;
XP_U16 count; XP_U16 count;
@ -3030,7 +3031,7 @@ addr_setType( CommsAddrRec* addr, CommsConnType type )
#ifdef XWFEATURE_RELAY #ifdef XWFEATURE_RELAY
static XWHostID static XWHostID
getDestID( CommsCtxt* comms, XWEnv xwe, XP_PlayerAddr channelNo ) getDestID( CommsCtxt* comms, XWEnv XP_UNUSED_DBG(xwe), XP_PlayerAddr channelNo )
{ {
XWHostID id = HOST_ID_NONE; XWHostID id = HOST_ID_NONE;
XP_Bool missingRelay = XP_FALSE; XP_Bool missingRelay = XP_FALSE;

5
xwords4/common/model.h
View file

@ -239,13 +239,16 @@ void model_makeTurnFromMoveInfo( ModelCtxt* model, XWEnv xwe, XP_U16 playerNum,
#ifdef DEBUG #ifdef DEBUG
void juggleMoveIfDebug( MoveInfo* move ); void juggleMoveIfDebug( MoveInfo* move );
void reverseTiles( MoveInfo* move );
void model_dumpSelf( const ModelCtxt* model, const XP_UCHAR* msg ); void model_dumpSelf( const ModelCtxt* model, const XP_UCHAR* msg );
#else #else
# define juggleMoveIfDebug(newMove) # define juggleMoveIfDebug(newMove)
# define model_dumpSelf( model, msg ) # define model_dumpSelf( model, msg )
#endif #endif
#ifdef XWFEATURE_ROBOTPHONIES
void reverseTiles( MoveInfo* move );
#endif
void model_resetCurrentTurn( ModelCtxt* model, XWEnv xwe, XP_S16 turn ); void model_resetCurrentTurn( ModelCtxt* model, XWEnv xwe, XP_S16 turn );
XP_S16 model_getNMoves( const ModelCtxt* model ); XP_S16 model_getNMoves( const ModelCtxt* model );

2
xwords4/common/smsproto.c
View file

@ -114,7 +114,7 @@ static void freeRec( SMSProto* state, ToPhoneRec* rec );
static void logResult( const SMSProto* state, XWEnv xwe, static void logResult( const SMSProto* state, XWEnv xwe,
const SMSMsgArray* result, const char* caller ); const SMSMsgArray* result, const char* caller );
#else #else
# define logResult( state, result, caller ) # define logResult( state, xwe, result, caller )
#endif #endif
SMSProto* SMSProto*

2
xwords4/common/smsproto.h
View file

@ -105,6 +105,6 @@ void smsproto_freeMsgArray( SMSProto* state, SMSMsgArray* arr );
# ifdef DEBUG # ifdef DEBUG
void smsproto_runTests( MPFORMAL XWEnv xwe, XW_DUtilCtxt* dutil ); void smsproto_runTests( MPFORMAL XWEnv xwe, XW_DUtilCtxt* dutil );
# else # else
# define smsproto_runTests( p1, p2 ) # define smsproto_runTests(p1,p2,p3 )
# endif # endif
#endif #endif