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

Fix compilation errors due to constant name changes -- no change to binary.

Browse source
This commit is contained in:
ehouse 2007-12-14 13:06:44 +00:00
parent c8bbfc5432
commit 9d42d1b902
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
linux/linuxmain.c
View file

@ -805,7 +805,7 @@ main( int argc, char** argv )
LaunchParams mainParams; LaunchParams mainParams;
XP_U16 robotCount = 0; XP_U16 robotCount = 0;
CommsConnType conType = COMMS_CONN_UNUSED; CommsConnType conType = COMMS_CONN_NONE;
#ifdef XWFEATURE_BLUETOOTH #ifdef XWFEATURE_BLUETOOTH
const char* btaddr = NULL; const char* btaddr = NULL;
#endif #endif
@ -901,14 +901,14 @@ main( int argc, char** argv )
break; break;
#ifdef XWFEATURE_RELAY #ifdef XWFEATURE_RELAY
case 'C': case 'C':
XP_ASSERT( conType == COMMS_CONN_UNUSED || XP_ASSERT( conType == COMMS_CONN_NONE ||
conType == COMMS_CONN_RELAY ); conType == COMMS_CONN_RELAY );
mainParams.connInfo.relay.cookie = optarg; mainParams.connInfo.relay.cookie = optarg;
conType = COMMS_CONN_RELAY; conType = COMMS_CONN_RELAY;
break; break;
#endif #endif
case 'D': case 'D':
XP_ASSERT( conType == COMMS_CONN_UNUSED || XP_ASSERT( conType == COMMS_CONN_NONE ||
conType == COMMS_CONN_IP_DIRECT ); conType == COMMS_CONN_IP_DIRECT );
hostName = optarg; hostName = optarg;
conType = COMMS_CONN_IP_DIRECT; conType = COMMS_CONN_IP_DIRECT;
@ -980,7 +980,7 @@ main( int argc, char** argv )
break; break;
case 'a': case 'a':
/* mainParams.info.clientInfo.serverName = */ /* mainParams.info.clientInfo.serverName = */
XP_ASSERT( conType == COMMS_CONN_UNUSED || XP_ASSERT( conType == COMMS_CONN_NONE ||
conType == COMMS_CONN_RELAY ); conType == COMMS_CONN_RELAY );
conType = COMMS_CONN_RELAY; conType = COMMS_CONN_RELAY;
hostName = optarg; hostName = optarg;
@ -993,7 +993,7 @@ main( int argc, char** argv )
break; break;
#ifdef XWFEATURE_BLUETOOTH #ifdef XWFEATURE_BLUETOOTH
case 'B': case 'B':
XP_ASSERT( conType == COMMS_CONN_UNUSED || XP_ASSERT( conType == COMMS_CONN_NONE ||
conType == COMMS_CONN_BT ); conType == COMMS_CONN_BT );
conType = COMMS_CONN_BT; conType = COMMS_CONN_BT;
btaddr = optarg; btaddr = optarg;

2
wince/cecondlg.c
View file

@ -111,7 +111,7 @@ conTypeToIndex( CommsConnType conType )
static CommsConnType static CommsConnType
indexToConType( XP_U16 index ) indexToConType( XP_U16 index )
{ {
CommsConnType conType = COMMS_CONN_UNUSED; CommsConnType conType = COMMS_CONN_NONE;
switch( index ) { switch( index ) {
case 0: case 0:
conType = COMMS_CONN_BT; break; conType = COMMS_CONN_BT; break;