1 files changed, 18 insertions, 19 deletions

diff --git a/xorg-server/Xext/security.c b/xorg-server/Xext/security.c
index bf2ab2e51..67b3a7e67 100644
--- a/xorg-server/Xext/security.c
+++ b/xorg-server/Xext/security.c
@@ -26,6 +26,8 @@ in this Software without prior written authorization from The Open Group.
 
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
+#else
+#define XACE
 #endif
 
 #include "scrnintstr.h"
@@ -193,10 +195,10 @@ SecurityDeleteAuthorization(void *value, XID id)
 
     while ((pEventClient = pAuth->eventClients)) {
         /* send revocation event event */
-        xSecurityAuthorizationRevokedEvent are = {
-            .type = SecurityEventBase + XSecurityAuthorizationRevoked,
-            .authId = pAuth->id
-        };
+        xSecurityAuthorizationRevokedEvent are;
+        are.type = SecurityEventBase + XSecurityAuthorizationRevoked;
+        are.authId = pAuth->id;
+
         WriteEventsToClient(rClient(pEventClient), 1, (xEvent *) &are);
         FreeResource(pEventClient->resource, RT_NONE);
     }
@@ -339,16 +341,14 @@ static int
 ProcSecurityQueryVersion(ClientPtr client)
 {
     /* REQUEST(xSecurityQueryVersionReq); */
-    xSecurityQueryVersionReply rep = {
-        .type = X_Reply,
-        .sequenceNumber = client->sequence,
-        .length = 0,
-        .majorVersion = SERVER_SECURITY_MAJOR_VERSION,
-        .minorVersion = SERVER_SECURITY_MINOR_VERSION
-    };
+    xSecurityQueryVersionReply rep;
 
     REQUEST_SIZE_MATCH(xSecurityQueryVersionReq);
-
+    rep.type = X_Reply;
+    rep.sequenceNumber = client->sequence;
+    rep.length = 0;
+    rep.majorVersion = SERVER_SECURITY_MAJOR_VERSION;
+    rep.minorVersion = SERVER_SECURITY_MINOR_VERSION;
     if (client->swapped) {
         swaps(&rep.sequenceNumber);
         swaps(&rep.majorVersion);
@@ -530,13 +530,12 @@ ProcSecurityGenerateAuthorization(ClientPtr client)
 
     /* tell client the auth id and data */
 
-    rep = (xSecurityGenerateAuthorizationReply) {
-        .type = X_Reply,
-        .sequenceNumber = client->sequence,
-        .length = bytes_to_int32(authdata_len),
-        .authId = authId,
-        .dataLength = authdata_len
-    };
+
+    rep.type = X_Reply;
+    rep.sequenceNumber = client->sequence;
+    rep.length = bytes_to_int32(authdata_len);
+    rep.authId = authId;
+    rep.dataLength = authdata_len;
 
     if (client->swapped) {
         swapl(&rep.length);