From 0009081c420a7549d5d124d2497b0d8d7f0820f9 Mon Sep 17 00:00:00 2001 From: marha Date: Wed, 1 Aug 2012 08:05:10 +0200 Subject: Solved compile errors --- xorg-server/randr/rrprovider.c | 52 ++++++++++----------- xorg-server/randr/rrproviderproperty.c | 84 +++++++++++++++++----------------- xorg-server/randr/rrscreen.c | 22 ++++----- 3 files changed, 79 insertions(+), 79 deletions(-) (limited to 'xorg-server/randr') diff --git a/xorg-server/randr/rrprovider.c b/xorg-server/randr/rrprovider.c index c4ed515d6..14d2d3db3 100644 --- a/xorg-server/randr/rrprovider.c +++ b/xorg-server/randr/rrprovider.c @@ -89,23 +89,23 @@ ProcRRGetProviders (ClientPtr client) if (!pScrPriv) { - rep = (xRRGetProvidersReply) { - .type = X_Reply, - .sequenceNumber = client->sequence, - .length = 0, - .timestamp = currentTime.milliseconds, - .nProviders = 0 - }; + + rep.type = X_Reply; + rep.sequenceNumber = client->sequence; + rep.length = 0; + rep.timestamp = currentTime.milliseconds; + rep.nProviders = 0; + extra = NULL; extraLen = 0; } else { - rep = (xRRGetProvidersReply) { - .type = X_Reply, - .sequenceNumber = client->sequence, - .timestamp = pScrPriv->lastSetTime.milliseconds, - .nProviders = total_providers, - .length = total_providers - }; + + rep.type = X_Reply; + rep.sequenceNumber = client->sequence; + rep.timestamp = pScrPriv->lastSetTime.milliseconds; + rep.nProviders = total_providers; + rep.length = total_providers; + extraLen = rep.length << 2; if (extraLen) { extra = malloc(extraLen); @@ -166,18 +166,18 @@ ProcRRGetProviderInfo (ClientPtr client) pScreen = provider->pScreen; pScrPriv = rrGetScrPriv(pScreen); - rep = (xRRGetProviderInfoReply) { - .type = X_Reply, - .status = RRSetConfigSuccess, - .sequenceNumber = client->sequence, - .length = 0, - .capabilities = provider->capabilities, - .nameLength = provider->nameLength, - .timestamp = pScrPriv->lastSetTime.milliseconds, - .nCrtcs = pScrPriv->numCrtcs, - .nOutputs = pScrPriv->numOutputs, - .nAssociatedProviders = 0 - }; + + rep.type = X_Reply; + rep.status = RRSetConfigSuccess; + rep.sequenceNumber = client->sequence; + rep.length = 0; + rep.capabilities = provider->capabilities; + rep.nameLength = provider->nameLength; + rep.timestamp = pScrPriv->lastSetTime.milliseconds; + rep.nCrtcs = pScrPriv->numCrtcs; + rep.nOutputs = pScrPriv->numOutputs; + rep.nAssociatedProviders = 0; + /* count associated providers */ if (provider->offload_sink) diff --git a/xorg-server/randr/rrproviderproperty.c b/xorg-server/randr/rrproviderproperty.c index e0a814ff8..a24d9d784 100644 --- a/xorg-server/randr/rrproviderproperty.c +++ b/xorg-server/randr/rrproviderproperty.c @@ -65,14 +65,14 @@ RRDestroyProviderProperty(RRPropertyPtr prop) static void RRDeleteProperty(RRProviderRec * provider, RRPropertyRec * prop) { - xRRProviderPropertyNotifyEvent event = { - .type = RREventBase + RRNotify, - .subCode = RRNotify_ProviderProperty, - .provider = provider->id, - .state = PropertyDelete, - .atom = prop->propertyName, - .timestamp = currentTime.milliseconds - }; + xRRProviderPropertyNotifyEvent event; + event.type = RREventBase + RRNotify; + event.subCode = RRNotify_ProviderProperty; + event.provider = provider->id; + event.state = PropertyDelete; + event.atom = prop->propertyName; + event.timestamp = currentTime.milliseconds; + RRDeliverPropertyEvent(provider->pScreen, (xEvent *) &event); @@ -236,14 +236,14 @@ RRChangeProviderProperty(RRProviderPtr provider, Atom property, Atom type, provider->pendingProperties = TRUE; if (sendevent) { - xRRProviderPropertyNotifyEvent event = { - .type = RREventBase + RRNotify, - .subCode = RRNotify_ProviderProperty, - .provider = provider->id, - .state = PropertyNewValue, - .atom = prop->propertyName, - .timestamp = currentTime.milliseconds - }; + xRRProviderPropertyNotifyEvent event; + event.type = RREventBase + RRNotify; + event.subCode = RRNotify_ProviderProperty; + event.provider = provider->id; + event.state = PropertyNewValue; + event.atom = prop->propertyName; + event.timestamp = currentTime.milliseconds; + RRDeliverPropertyEvent(provider->pScreen, (xEvent *) &event); } return Success; @@ -395,12 +395,12 @@ ProcRRListProviderProperties(ClientPtr client) if (!(pAtoms = (Atom *) malloc(numProps * sizeof(Atom)))) return BadAlloc; - rep = (xRRListProviderPropertiesReply) { - .type = X_Reply, - .sequenceNumber = client->sequence, - .length = bytes_to_int32(numProps * sizeof(Atom)), - .nAtoms = numProps - }; + + rep.type = X_Reply; + rep.sequenceNumber = client->sequence; + rep.length = bytes_to_int32(numProps * sizeof(Atom)); + rep.nAtoms = numProps; + if (client->swapped) { swaps(&rep.sequenceNumber); swapl(&rep.length); @@ -441,14 +441,14 @@ ProcRRQueryProviderProperty(ClientPtr client) if (!extra) return BadAlloc; } - rep = (xRRQueryProviderPropertyReply) { - .type = X_Reply, - .sequenceNumber = client->sequence, - .length = prop->num_valid, - .pending = prop->is_pending, - .range = prop->range, - .immutable = prop->immutable - }; + + rep.type = X_Reply; + rep.sequenceNumber = client->sequence; + rep.length = prop->num_valid; + rep.pending = prop->is_pending; + rep.range = prop->range; + rep.immutable = prop->immutable; + if (client->swapped) { swaps(&rep.sequenceNumber); swapl(&rep.length); @@ -573,12 +573,12 @@ ProcRRGetProviderProperty(ClientPtr client) RRPropertyValuePtr prop_value; unsigned long n, len, ind; RRProviderPtr provider; - xRRGetProviderPropertyReply reply = { - .type = X_Reply, - .sequenceNumber = client->sequence - }; + xRRGetProviderPropertyReply reply; char *extra = NULL; + reply.type = X_Reply; + reply.sequenceNumber = client->sequence; + REQUEST_SIZE_MATCH(xRRGetProviderPropertyReq); if (stuff->delete) UpdateCurrentTime(); @@ -678,14 +678,14 @@ ProcRRGetProviderProperty(ClientPtr client) reply.propertyType = prop_value->type; if (stuff->delete && (reply.bytesAfter == 0)) { - xRRProviderPropertyNotifyEvent event = { - .type = RREventBase + RRNotify, - .subCode = RRNotify_ProviderProperty, - .provider = provider->id, - .state = PropertyDelete, - .atom = prop->propertyName, - .timestamp = currentTime.milliseconds - }; + xRRProviderPropertyNotifyEvent event; + event.type = RREventBase + RRNotify; + event.subCode = RRNotify_ProviderProperty; + event.provider = provider->id; + event.state = PropertyDelete; + event.atom = prop->propertyName; + event.timestamp = currentTime.milliseconds; + RRDeliverPropertyEvent(provider->pScreen, (xEvent *) &event); } diff --git a/xorg-server/randr/rrscreen.c b/xorg-server/randr/rrscreen.c index 45c5139c9..c11882b53 100644 --- a/xorg-server/randr/rrscreen.c +++ b/xorg-server/randr/rrscreen.c @@ -395,17 +395,17 @@ rrGetMultiScreenResources(ClientPtr client, Bool query, ScreenPtr pScreen) ErrorF("reporting %d %d %d %d\n", total_crtcs, total_outputs, total_modes, total_name_len); pScrPriv = rrGetScrPriv(pScreen); - rep = (xRRGetScreenResourcesReply) { - .type = X_Reply, - .sequenceNumber = client->sequence, - .length = 0, - .timestamp = pScrPriv->lastSetTime.milliseconds, - .configTimestamp = pScrPriv->lastConfigTime.milliseconds, - .nCrtcs = total_crtcs, - .nOutputs = total_outputs, - .nModes = total_modes, - .nbytesNames = total_name_len - }; + + rep.type = X_Reply; + rep.sequenceNumber = client->sequence; + rep.length = 0; + rep.timestamp = pScrPriv->lastSetTime.milliseconds; + rep.configTimestamp = pScrPriv->lastConfigTime.milliseconds; + rep.nCrtcs = total_crtcs; + rep.nOutputs = total_outputs; + rep.nModes = total_modes; + rep.nbytesNames = total_name_len; + rep.length = (total_crtcs + total_outputs + total_modes * bytes_to_int32(SIZEOF(xRRModeInfo)) + bytes_to_int32(rep.nbytesNames)); -- cgit v1.2.3