Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-15 15:41:24 +01:00
Code Issues Projects Releases Packages Wiki Activity

Turn on BT so 4.3a4 can have a non-M rev number; up version for 4.2.

Browse source
This commit is contained in:
ehouse 2007-02-03 20:36:22 +00:00
parent 7c8b7294cd
commit e8f2215221
3 changed files with 2 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
xwords4/palm/Makefile
View file

@ -119,7 +119,7 @@ MYDEFS_COMMON += -DXWFEATURE_SEARCHLIMIT
# MYDEFS_COMMON += -DXWFEATURE_RELAY
# turn on bluetooth comms option for 68K and ARM -- which won't work yet
#BLUETOOTH = -DXWFEATURE_BLUETOOTH
BLUETOOTH = -DXWFEATURE_BLUETOOTH
#MYDEFS_COMMON += $(BLUETOOTH)
# Add menu allowing to choose to run 68K or ARM

12
xwords4/palm/palmbt.c
View file

@ -230,12 +230,6 @@ palm_bt_amendWaitTicks( PalmAppGlobals* globals, Int32* result )
PalmBTStuff* btStuff = globals->btStuff;
if ( !!btStuff && HASWORK(btStuff) ) {
*result = 0;
} else {
XP_ASSERT( (btStuff == NULL)
|| (btStuff->vol.out.lens[0] == 0)
|| btStuff->vol.sendInProgress
|| (SOCK_INVAL == btStuff->dataSocket)
|| (btStuff->p_connState != PBTST_L2C_CONNECTED) );
}
}
@ -244,12 +238,6 @@ palm_bt_doWork( PalmAppGlobals* globals, BtUIState* btUIStateP )
{
PalmBTStuff* btStuff = globals->btStuff;
XP_Bool haveWork = !!btStuff && HASWORK(btStuff);
XP_ASSERT( !btStuff || haveWork
|| (btStuff->vol.out.lens[0] == 0 )
|| btStuff->vol.sendInProgress
|| (SOCK_INVAL == btStuff->dataSocket)
|| (btStuff->p_connState != PBTST_L2C_CONNECTED) );
if ( haveWork ) {
pbt_do_work( btStuff );

2
xwords4/palm/xwords4defines.h
View file

@ -425,7 +425,7 @@
#ifdef XWFEATURE_BLUETOOTH
# define XW_PALM_VERSION_STRING "4.3a4"
#else
# define XW_PALM_VERSION_STRING "4.2b4"
# define XW_PALM_VERSION_STRING "4.2b5"
#endif
#define CUR_PREFS_VERS 0x0405