Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2024-12-30 10:26:58 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

constant name changed

Browse source
This commit is contained in:
ehouse 2005-08-21 14:18:56 +00:00
parent cca35b28db
commit df5c274c31
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
linux/gtkmain.h
View file

@ -86,7 +86,7 @@ typedef struct GtkAppGlobals {
ClientStreamRec clientRecs[MAX_NUM_PLAYERS]; ClientStreamRec clientRecs[MAX_NUM_PLAYERS];
guint timerSources[TIMER_NUM_PLUS_ONE - 1]; guint timerSources[NUM_TIMERS_PLUS_ONE - 1];
CommonPrefs cp; CommonPrefs cp;

4
linux/main.h
View file

@ -83,8 +83,8 @@ typedef struct CommonGlobals {
SocketChangedFunc socketChanged; SocketChangedFunc socketChanged;
void* socketChangedClosure; void* socketChangedClosure;
TimerProc timerProcs[TIMER_NUM_PLUS_ONE - 1]; TimerProc timerProcs[NUM_TIMERS_PLUS_ONE - 1];
void* timerClosures[TIMER_NUM_PLUS_ONE - 1]; void* timerClosures[NUM_TIMERS_PLUS_ONE - 1];
} CommonGlobals; } CommonGlobals;
#endif #endif

4
palm/palmmain.c
View file

@ -1385,7 +1385,7 @@ figureWaitTicks( PalmAppGlobals* globals )
#endif #endif
} else if ( globals->timeRequested || globals->hintPending ) { } else if ( globals->timeRequested || globals->hintPending ) {
result = 0; result = 0;
} else if ( *timeForTimer( globals, &why, &when ) ) { } else if ( timeForTimer( globals, &why, &when ) ) {
result = when - TimGetTicks(); result = when - TimGetTicks();
if ( result < 0 ) { if ( result < 0 ) {
result = 0; result = 0;
@ -1563,7 +1563,7 @@ timeForTimer( PalmAppGlobals* globals, XWTimerReason* why, XP_U32* when )
XP_U32 nextWhen = 0xFFFFFFFF; XP_U32 nextWhen = 0xFFFFFFFF;
XP_Bool found; XP_Bool found;
for ( i = 1; i < TIMER_NUM_PLUS_ONE; ++i ) { for ( i = 1; i < NUM_TIMERS_PLUS_ONE; ++i ) {
if ( (globals->timerProcs[i] != NULL) && if ( (globals->timerProcs[i] != NULL) &&
(globals->timerFireAt[i] < nextWhen) ) { (globals->timerFireAt[i] < nextWhen) ) {
nextWhy = i; nextWhy = i;

6
palm/palmmain.h
View file

@ -306,9 +306,9 @@ struct PalmAppGlobals {
struct ConnsDlgState* connState; struct ConnsDlgState* connState;
TimerProc timerProcs[TIMER_NUM_PLUS_ONE]; TimerProc timerProcs[NUM_TIMERS_PLUS_ONE];
void* timerClosures[TIMER_NUM_PLUS_ONE]; void* timerClosures[NUM_TIMERS_PLUS_ONE];
XP_U32 timerFireAt[TIMER_NUM_PLUS_ONE]; XP_U32 timerFireAt[NUM_TIMERS_PLUS_ONE];
#ifdef BEYOND_IR #ifdef BEYOND_IR
NetLibStuff nlStuff; NetLibStuff nlStuff;