diff options
| author | marha <marha@users.sourceforge.net> | 2010-05-11 15:11:55 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-05-11 15:11:55 +0000 |
| commit | 820f57fadfe7d14e01e0284ff8a23298a0f59b20 (patch) | |
| tree | 14b8a09656a95a710b976895d89f02e79ad30298 /xorg-server/Xext/sync.c | |
| parent | 20a84cc5bb91a8708cd9e9ebcd1715ceeab8dae2 (diff) | |
| download | vcxsrv-820f57fadfe7d14e01e0284ff8a23298a0f59b20.tar.gz vcxsrv-820f57fadfe7d14e01e0284ff8a23298a0f59b20.tar.bz2 vcxsrv-820f57fadfe7d14e01e0284ff8a23298a0f59b20.zip | |
svn merge -r581:HEAD "^/branches/released" .
Diffstat (limited to 'xorg-server/Xext/sync.c')
| -rw-r--r-- | xorg-server/Xext/sync.c | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/xorg-server/Xext/sync.c b/xorg-server/Xext/sync.c index 2b02dbbfb..d8ea27dda 100644 --- a/xorg-server/Xext/sync.c +++ b/xorg-server/Xext/sync.c @@ -94,7 +94,7 @@ static SyncCounter **SysCounterList = NULL; #define XSyncCAAllTrigger \ (XSyncCACounter | XSyncCAValueType | XSyncCAValue | XSyncCATestType) -static void SyncComputeBracketValues(SyncCounter *, Bool); +static void SyncComputeBracketValues(SyncCounter *); static void SyncInitServerTime(void); @@ -167,7 +167,7 @@ SyncDeleteTriggerFromCounter(SyncTrigger *pTrigger) } if (IsSystemCounter(pTrigger->pCounter)) - SyncComputeBracketValues(pTrigger->pCounter, /*startOver*/ TRUE); + SyncComputeBracketValues(pTrigger->pCounter); } @@ -194,7 +194,7 @@ SyncAddTriggerToCounter(SyncTrigger *pTrigger) pTrigger->pCounter->pTriglist = pCur; if (IsSystemCounter(pTrigger->pCounter)) - SyncComputeBracketValues(pTrigger->pCounter, /*startOver*/ TRUE); + SyncComputeBracketValues(pTrigger->pCounter); return Success; } @@ -351,7 +351,7 @@ SyncInitTrigger(ClientPtr client, SyncTrigger *pTrigger, XSyncCounter counter, } else if (IsSystemCounter(pCounter)) { - SyncComputeBracketValues(pCounter, /*startOver*/ TRUE); + SyncComputeBracketValues(pCounter); } return Success; @@ -646,7 +646,7 @@ SyncChangeCounter(SyncCounter *pCounter, CARD64 newval) if (IsSystemCounter(pCounter)) { - SyncComputeBracketValues(pCounter, /* startOver */ FALSE); + SyncComputeBracketValues(pCounter); } } @@ -913,7 +913,7 @@ SyncDestroySystemCounter(pointer pSysCounter) } static void -SyncComputeBracketValues(SyncCounter *pCounter, Bool startOver) +SyncComputeBracketValues(SyncCounter *pCounter) { SyncTriggerList *pCur; SyncTrigger *pTrigger; @@ -930,11 +930,8 @@ SyncComputeBracketValues(SyncCounter *pCounter, Bool startOver) if (ct == XSyncCounterNeverChanges) return; - if (startOver) - { - XSyncMaxValue(&psci->bracket_greater); - XSyncMinValue(&psci->bracket_less); - } + XSyncMaxValue(&psci->bracket_greater); + XSyncMinValue(&psci->bracket_less); for (pCur = pCounter->pTriglist; pCur; pCur = pCur->next) { |