diff options
| author | marha <marha@users.sourceforge.net> | 2009-12-20 22:23:03 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-12-20 22:23:03 +0000 |
| commit | c438f190eedc71ee8dd14e14fec660e98d3dc0bf (patch) | |
| tree | 9f128ed0356e62d09b44a720ac20bdc60566b66e /xorg-server/Xext/sync.c | |
| parent | d842f9ef1c88a7aad04a78613548fc0f0638ac48 (diff) | |
| parent | d8432fdd4f13e9f9d1d44f5482faeb56562661a9 (diff) | |
| download | vcxsrv-c438f190eedc71ee8dd14e14fec660e98d3dc0bf.tar.gz vcxsrv-c438f190eedc71ee8dd14e14fec660e98d3dc0bf.tar.bz2 vcxsrv-c438f190eedc71ee8dd14e14fec660e98d3dc0bf.zip | |
svn merge ^/branches/released
Diffstat (limited to 'xorg-server/Xext/sync.c')
| -rw-r--r-- | xorg-server/Xext/sync.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/xorg-server/Xext/sync.c b/xorg-server/Xext/sync.c index bb5931582..d8374fe96 100644 --- a/xorg-server/Xext/sync.c +++ b/xorg-server/Xext/sync.c @@ -873,7 +873,7 @@ SyncCreateSystemCounter( */ if (RTCounter == 0) { - RTCounter = CreateNewResourceType(FreeCounter); + RTCounter = CreateNewResourceType(FreeCounter, "SyncCounter"); if (RTCounter == 0) { return NULL; @@ -2114,11 +2114,15 @@ SyncExtensionInit(void) if (RTCounter == 0) { - RTCounter = CreateNewResourceType(FreeCounter); + RTCounter = CreateNewResourceType(FreeCounter, "SyncCounter"); } - RTAlarm = CreateNewResourceType(FreeAlarm); - RTAwait = CreateNewResourceType(FreeAwait)|RC_NEVERRETAIN; - RTAlarmClient = CreateNewResourceType(FreeAlarmClient)|RC_NEVERRETAIN; + RTAlarm = CreateNewResourceType(FreeAlarm, "SyncAlarm"); + RTAwait = CreateNewResourceType(FreeAwait, "SyncAwait"); + if (RTAwait) + RTAwait |= RC_NEVERRETAIN; + RTAlarmClient = CreateNewResourceType(FreeAlarmClient, "SyncAlarmClient"); + if (RTAlarmClient) + RTAlarmClient |= RC_NEVERRETAIN; if (RTCounter == 0 || RTAwait == 0 || RTAlarm == 0 || RTAlarmClient == 0 || |