Update to xserver 1.20.5. Tested by jsg@

1 files changed, 14 insertions, 16 deletions

diff --git a/xserver/Xi/xiproperty.c b/xserver/Xi/xiproperty.c
index b7a1f59f4..6ec419e87 100644
--- a/xserver/Xi/xiproperty.c
+++ b/xserver/Xi/xiproperty.c
@@ -372,8 +372,7 @@ XIGetKnownProperty(const char *name)
     if (!name)
         return None;
 
-    for (i = 0; i < (sizeof(dev_properties) / sizeof(struct dev_properties));
-         i++) {
+    for (i = 0; i < ARRAY_SIZE(dev_properties); i++) {
         if (strcmp(name, dev_properties[i].name) == 0) {
             if (dev_properties[i].type == None) {
                 dev_properties[i].type =
@@ -393,8 +392,7 @@ XIResetProperties(void)
 {
     int i;
 
-    for (i = 0; i < (sizeof(dev_properties) / sizeof(struct dev_properties));
-         i++)
+    for (i = 0; i < ARRAY_SIZE(dev_properties); i++)
         dev_properties[i].type = None;
 }
 
@@ -1013,7 +1011,7 @@ ProcXGetDeviceProperty(ClientPtr client)
     return Success;
 }
 
-int
+int _X_COLD
 SProcXListDeviceProperties(ClientPtr client)
 {
     REQUEST(xListDevicePropertiesReq);
@@ -1023,7 +1021,7 @@ SProcXListDeviceProperties(ClientPtr client)
     return (ProcXListDeviceProperties(client));
 }
 
-int
+int _X_COLD
 SProcXChangeDeviceProperty(ClientPtr client)
 {
     REQUEST(xChangeDevicePropertyReq);
@@ -1036,7 +1034,7 @@ SProcXChangeDeviceProperty(ClientPtr client)
     return (ProcXChangeDeviceProperty(client));
 }
 
-int
+int _X_COLD
 SProcXDeleteDeviceProperty(ClientPtr client)
 {
     REQUEST(xDeleteDevicePropertyReq);
@@ -1047,7 +1045,7 @@ SProcXDeleteDeviceProperty(ClientPtr client)
     return (ProcXDeleteDeviceProperty(client));
 }
 
-int
+int _X_COLD
 SProcXGetDeviceProperty(ClientPtr client)
 {
     REQUEST(xGetDevicePropertyReq);
@@ -1063,7 +1061,7 @@ SProcXGetDeviceProperty(ClientPtr client)
 
 /* Reply swapping */
 
-void
+void _X_COLD
 SRepXListDeviceProperties(ClientPtr client, int size,
                           xListDevicePropertiesReply * rep)
 {
@@ -1074,7 +1072,7 @@ SRepXListDeviceProperties(ClientPtr client, int size,
     WriteToClient(client, size, rep);
 }
 
-void
+void _X_COLD
 SRepXGetDeviceProperty(ClientPtr client, int size,
                        xGetDevicePropertyReply * rep)
 {
@@ -1252,7 +1250,7 @@ ProcXIGetProperty(ClientPtr client)
     return Success;
 }
 
-int
+int _X_COLD
 SProcXIListProperties(ClientPtr client)
 {
     REQUEST(xXIListPropertiesReq);
@@ -1263,7 +1261,7 @@ SProcXIListProperties(ClientPtr client)
     return (ProcXIListProperties(client));
 }
 
-int
+int _X_COLD
 SProcXIChangeProperty(ClientPtr client)
 {
     REQUEST(xXIChangePropertyReq);
@@ -1277,7 +1275,7 @@ SProcXIChangeProperty(ClientPtr client)
     return (ProcXIChangeProperty(client));
 }
 
-int
+int _X_COLD
 SProcXIDeleteProperty(ClientPtr client)
 {
     REQUEST(xXIDeletePropertyReq);
@@ -1289,7 +1287,7 @@ SProcXIDeleteProperty(ClientPtr client)
     return (ProcXIDeleteProperty(client));
 }
 
-int
+int _X_COLD
 SProcXIGetProperty(ClientPtr client)
 {
     REQUEST(xXIGetPropertyReq);
@@ -1304,7 +1302,7 @@ SProcXIGetProperty(ClientPtr client)
     return (ProcXIGetProperty(client));
 }
 
-void
+void _X_COLD
 SRepXIListProperties(ClientPtr client, int size, xXIListPropertiesReply * rep)
 {
     swaps(&rep->sequenceNumber);
@@ -1314,7 +1312,7 @@ SRepXIListProperties(ClientPtr client, int size, xXIListPropertiesReply * rep)
     WriteToClient(client, size, rep);
 }
 
-void
+void _X_COLD
 SRepXIGetProperty(ClientPtr client, int size, xXIGetPropertyReply * rep)
 {
     swaps(&rep->sequenceNumber);