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

Helps to compile platforms too before checking in...

Browse source
This commit is contained in:
ehouse 2009-02-01 16:20:18 +00:00
parent 4b969503e3
commit 62d247ee49
3 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
palm/palmmain.c
View file

@ -3871,7 +3871,7 @@ palm_util_setTimer( XW_UtilCtxt* uc, XWTimerReason why,
} else if ( why == TIMER_TIMERTICK ) { } else if ( why == TIMER_TIMERTICK ) {
now += SysTicksPerSecond(); now += SysTicksPerSecond();
#if defined XWFEATURE_RELAY || defined COMMS_HEARTBEAT #if defined XWFEATURE_RELAY || defined COMMS_HEARTBEAT
} else if ( why == TIMER_HEARTBEAT ) { } else if ( why == TIMER_COMMS ) {
now += (secsFromNow * SysTicksPerSecond()); now += (secsFromNow * SysTicksPerSecond());
#endif #endif
#ifdef XWFEATURE_BLUETOOTH #ifdef XWFEATURE_BLUETOOTH

5
relay/xwrelay.h
View file

@ -74,12 +74,9 @@ enum { XWRELAY_NONE /* 0 is an illegal value */
, XWRELAY_CONNECTDENIED , XWRELAY_CONNECTDENIED
/* The relay says go away. Format: reason code: 1 */ /* The relay says go away. Format: reason code: 1 */
#ifdef RELAY_HEARTBEAT
, XWRELAY_HEARTBEAT , XWRELAY_HEARTBEAT
/* Sent in either direction. Format: cookieID: 2; srcID: 1 */ /* Sent in either direction. Format: cookieID: 2; srcID: 1 */
#else
, _XWRELAY_HEARTBEAT /* don't use this */
#endif
, XWRELAY_MSG_FROMRELAY , XWRELAY_MSG_FROMRELAY
/* Sent from relay to device. Format: cookieID: 2; src_hostID: 1; /* Sent from relay to device. Format: cookieID: 2; src_hostID: 1;
dest_hostID: 1; data <len-headerLen> */ dest_hostID: 1; data <len-headerLen> */

6
wince/cemain.c
View file

@ -2014,7 +2014,7 @@ checkFireLateKeyTimer( CEAppGlobals* globals )
XP_Bool drop = XP_FALSE; XP_Bool drop = XP_FALSE;
XWTimerReason whys[] = { TIMER_PENDOWN, TIMER_TIMERTICK XWTimerReason whys[] = { TIMER_PENDOWN, TIMER_TIMERTICK
#if defined XWFEATURE_RELAY || defined COMMS_HEARTBEAT #if defined XWFEATURE_RELAY || defined COMMS_HEARTBEAT
, TIMER_HEARTBEAT , TIMER_COMMS
#endif #endif
}; };
XP_U32 now = GetCurrentTime(); XP_U32 now = GetCurrentTime();
@ -2477,7 +2477,7 @@ WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
why = (XWTimerReason)wParam; why = (XWTimerReason)wParam;
if ( why == TIMER_PENDOWN || why == TIMER_TIMERTICK if ( why == TIMER_PENDOWN || why == TIMER_TIMERTICK
#if defined XWFEATURE_RELAY || defined COMMS_HEARTBEAT #if defined XWFEATURE_RELAY || defined COMMS_HEARTBEAT
|| why == TIMER_HEARTBEAT || why == TIMER_COMMS
#endif #endif
) { ) {
XP_ASSERT( why < NUM_TIMERS_PLUS_ONE ); XP_ASSERT( why < NUM_TIMERS_PLUS_ONE );
@ -3185,7 +3185,7 @@ ce_util_setTimer( XW_UtilCtxt* uc, XWTimerReason why,
howLong = 1000; /* 1 second */ howLong = 1000; /* 1 second */
break; break;
#if defined XWFEATURE_RELAY || defined COMMS_HEARTBEAT #if defined XWFEATURE_RELAY || defined COMMS_HEARTBEAT
case TIMER_HEARTBEAT: case TIMER_COMMS:
howLong = when * 1000; howLong = when * 1000;
break; break;
#endif #endif