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/rrproviderproperty.c | 84 +++++++++++++++++----------------- 1 file changed, 42 insertions(+), 42 deletions(-) (limited to 'xorg-server/randr/rrproviderproperty.c') 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); } -- cgit v1.2.3