[PATCH xserver] dispatch: Mark swapped dispatch as _X_COLD

Adam Jackson ajax at redhat.com
Thu Feb 16 19:56:45 UTC 2017


This touches everything that ends up in the Xorg binary; the big missing
part is GLX since that's all generated code. Cuts about 14k from the
binary on amd64.

Signed-off-by: Adam Jackson <ajax at redhat.com>
---
 Xext/dpms.c                 |  18 ++---
 Xext/geext.c                |   6 +-
 Xext/panoramiXSwap.c        |  14 ++--
 Xext/saver.c                |  16 ++---
 Xext/security.c             |  10 +--
 Xext/shape.c                |  22 +++---
 Xext/shm.c                  |  20 +++---
 Xext/sync.c                 |  46 ++++++-------
 Xext/vidmode.c              |  44 ++++++------
 Xext/xcmisc.c               |   8 +--
 Xext/xf86bigfont.c          |   6 +-
 Xext/xres.c                 |  12 ++--
 Xext/xselinux_ext.c         |  20 +++---
 Xext/xtest.c                |  12 ++--
 Xext/xvdisp.c               |  42 ++++++------
 Xext/xvmain.c               |   4 +-
 Xext/xvmc.c                 |   2 +-
 Xi/allowev.c                |   2 +-
 Xi/chgdctl.c                |   4 +-
 Xi/chgfctl.c                |   2 +-
 Xi/chgkbd.c                 |   2 +-
 Xi/chgkmap.c                |   2 +-
 Xi/chgprop.c                |   2 +-
 Xi/chgptr.c                 |   2 +-
 Xi/closedev.c               |   2 +-
 Xi/devbell.c                |   2 +-
 Xi/extinit.c                |   8 +--
 Xi/getbmap.c                |   4 +-
 Xi/getdctl.c                |   4 +-
 Xi/getfctl.c                |   4 +-
 Xi/getfocus.c               |   4 +-
 Xi/getkmap.c                |   4 +-
 Xi/getmmap.c                |   4 +-
 Xi/getprop.c                |   4 +-
 Xi/getselev.c               |   4 +-
 Xi/getvers.c                |   4 +-
 Xi/grabdev.c                |   4 +-
 Xi/grabdevb.c               |   2 +-
 Xi/grabdevk.c               |   2 +-
 Xi/gtmotion.c               |   4 +-
 Xi/listdev.c                |   4 +-
 Xi/opendev.c                |   4 +-
 Xi/queryst.c                |   4 +-
 Xi/selectev.c               |   2 +-
 Xi/sendexev.c               |   2 +-
 Xi/setbmap.c                |   4 +-
 Xi/setdval.c                |   4 +-
 Xi/setfocus.c               |   2 +-
 Xi/setmmap.c                |   4 +-
 Xi/setmode.c                |   4 +-
 Xi/ungrdev.c                |   2 +-
 Xi/ungrdevb.c               |   2 +-
 Xi/ungrdevk.c               |   2 +-
 Xi/xiallowev.c              |   2 +-
 Xi/xibarriers.c             |   2 +-
 Xi/xichangecursor.c         |   2 +-
 Xi/xichangehierarchy.c      |   2 +-
 Xi/xigetclientpointer.c     |   4 +-
 Xi/xigrabdev.c              |   6 +-
 Xi/xipassivegrab.c          |   6 +-
 Xi/xiproperty.c             |  24 +++----
 Xi/xiquerydevice.c          |   2 +-
 Xi/xiquerypointer.c         |   2 +-
 Xi/xiqueryversion.c         |   4 +-
 Xi/xiselectev.c             |   4 +-
 Xi/xisetclientpointer.c     |   2 +-
 Xi/xisetdevfocus.c          |   4 +-
 Xi/xiwarppointer.c          |   2 +-
 composite/compext.c         |  41 ++++++-----
 damageext/damageext.c       |  14 ++--
 dbe/dbe.c                   |  14 ++--
 dix/swaprep.c               | 164 ++++++++++++++++++++++----------------------
 dix/swapreq.c               | 136 ++++++++++++++++++------------------
 dri3/dri3_request.c         |  14 ++--
 hw/dmx/dmx.c                |  32 ++++-----
 hw/xfree86/common/xf86DGA.c |   2 +-
 hw/xfree86/dri/xf86dri.c    |   6 +-
 hw/xfree86/dri2/dri2ext.c   |   4 +-
 present/present_request.c   |  12 ++--
 randr/randr.c               |   6 +-
 randr/rrsdispatch.c         |  97 ++++++++++++++------------
 randr/rrxinerama.c          |  14 ++--
 record/record.c             |  20 +++---
 render/render.c             |  74 ++++++++++----------
 xfixes/cursor.c             |  24 +++----
 xfixes/region.c             |  34 ++++-----
 xfixes/saveset.c            |   2 +-
 xfixes/select.c             |   4 +-
 xfixes/xfixes.c             |   4 +-
 xkb/xkbSwap.c               |  54 +++++++--------
 90 files changed, 637 insertions(+), 621 deletions(-)

diff --git a/Xext/dpms.c b/Xext/dpms.c
index cdfaa97..4b620d5 100644
--- a/Xext/dpms.c
+++ b/Xext/dpms.c
@@ -234,7 +234,7 @@ ProcDPMSDispatch(ClientPtr client)
     }
 }
 
-static int
+static int _X_COLD
 SProcDPMSGetVersion(ClientPtr client)
 {
     REQUEST(xDPMSGetVersionReq);
@@ -246,7 +246,7 @@ SProcDPMSGetVersion(ClientPtr client)
     return ProcDPMSGetVersion(client);
 }
 
-static int
+static int _X_COLD
 SProcDPMSCapable(ClientPtr client)
 {
     REQUEST(xDPMSCapableReq);
@@ -257,7 +257,7 @@ SProcDPMSCapable(ClientPtr client)
     return ProcDPMSCapable(client);
 }
 
-static int
+static int _X_COLD
 SProcDPMSGetTimeouts(ClientPtr client)
 {
     REQUEST(xDPMSGetTimeoutsReq);
@@ -268,7 +268,7 @@ SProcDPMSGetTimeouts(ClientPtr client)
     return ProcDPMSGetTimeouts(client);
 }
 
-static int
+static int _X_COLD
 SProcDPMSSetTimeouts(ClientPtr client)
 {
     REQUEST(xDPMSSetTimeoutsReq);
@@ -282,7 +282,7 @@ SProcDPMSSetTimeouts(ClientPtr client)
     return ProcDPMSSetTimeouts(client);
 }
 
-static int
+static int _X_COLD
 SProcDPMSEnable(ClientPtr client)
 {
     REQUEST(xDPMSEnableReq);
@@ -293,7 +293,7 @@ SProcDPMSEnable(ClientPtr client)
     return ProcDPMSEnable(client);
 }
 
-static int
+static int _X_COLD
 SProcDPMSDisable(ClientPtr client)
 {
     REQUEST(xDPMSDisableReq);
@@ -304,7 +304,7 @@ SProcDPMSDisable(ClientPtr client)
     return ProcDPMSDisable(client);
 }
 
-static int
+static int _X_COLD
 SProcDPMSForceLevel(ClientPtr client)
 {
     REQUEST(xDPMSForceLevelReq);
@@ -317,7 +317,7 @@ SProcDPMSForceLevel(ClientPtr client)
     return ProcDPMSForceLevel(client);
 }
 
-static int
+static int _X_COLD
 SProcDPMSInfo(ClientPtr client)
 {
     REQUEST(xDPMSInfoReq);
@@ -328,7 +328,7 @@ SProcDPMSInfo(ClientPtr client)
     return ProcDPMSInfo(client);
 }
 
-static int
+static int _X_COLD
 SProcDPMSDispatch(ClientPtr client)
 {
     REQUEST(xReq);
diff --git a/Xext/geext.c b/Xext/geext.c
index 6312f24..08dff28 100644
--- a/Xext/geext.c
+++ b/Xext/geext.c
@@ -98,7 +98,7 @@ static int (*ProcGEVector[GENumberRequests]) (ClientPtr) = {
 /************************************************************/
 /*                swapped request handlers                  */
 /************************************************************/
-static int
+static int _X_COLD
 SProcGEQueryVersion(ClientPtr client)
 {
     REQUEST(xGEQueryVersionReq);
@@ -136,7 +136,7 @@ ProcGEDispatch(ClientPtr client)
 }
 
 /* dispatch swapped requests */
-static int
+static int _X_COLD
 SProcGEDispatch(ClientPtr client)
 {
     REQUEST(xGEReq);
@@ -159,7 +159,7 @@ GEResetProc(ExtensionEntry * extEntry)
  *  written on the wire, this one calls the registered swap function to do the
  *  work.
  */
-static void
+static void _X_COLD
 SGEGenericEvent(xEvent *from, xEvent *to)
 {
     xGenericEvent *gefrom = (xGenericEvent *) from;
diff --git a/Xext/panoramiXSwap.c b/Xext/panoramiXSwap.c
index b6ff6f9..022defd 100644
--- a/Xext/panoramiXSwap.c
+++ b/Xext/panoramiXSwap.c
@@ -47,7 +47,7 @@ Equipment Corporation.
 #include "globals.h"
 #include "panoramiXh.h"
 
-static int
+static int _X_COLD
 SProcPanoramiXQueryVersion(ClientPtr client)
 {
     REQUEST(xPanoramiXQueryVersionReq);
@@ -57,7 +57,7 @@ SProcPanoramiXQueryVersion(ClientPtr client)
     return ProcPanoramiXQueryVersion(client);
 }
 
-static int
+static int _X_COLD
 SProcPanoramiXGetState(ClientPtr client)
 {
     REQUEST(xPanoramiXGetStateReq);
@@ -68,7 +68,7 @@ SProcPanoramiXGetState(ClientPtr client)
     return ProcPanoramiXGetState(client);
 }
 
-static int
+static int _X_COLD
 SProcPanoramiXGetScreenCount(ClientPtr client)
 {
     REQUEST(xPanoramiXGetScreenCountReq);
@@ -79,7 +79,7 @@ SProcPanoramiXGetScreenCount(ClientPtr client)
     return ProcPanoramiXGetScreenCount(client);
 }
 
-static int
+static int _X_COLD
 SProcPanoramiXGetScreenSize(ClientPtr client)
 {
     REQUEST(xPanoramiXGetScreenSizeReq);
@@ -91,7 +91,7 @@ SProcPanoramiXGetScreenSize(ClientPtr client)
     return ProcPanoramiXGetScreenSize(client);
 }
 
-static int
+static int _X_COLD
 SProcXineramaIsActive(ClientPtr client)
 {
     REQUEST(xXineramaIsActiveReq);
@@ -101,7 +101,7 @@ SProcXineramaIsActive(ClientPtr client)
     return ProcXineramaIsActive(client);
 }
 
-static int
+static int _X_COLD
 SProcXineramaQueryScreens(ClientPtr client)
 {
     REQUEST(xXineramaQueryScreensReq);
@@ -111,7 +111,7 @@ SProcXineramaQueryScreens(ClientPtr client)
     return ProcXineramaQueryScreens(client);
 }
 
-int
+int _X_COLD
 SProcPanoramiXDispatch(ClientPtr client)
 {
     REQUEST(xReq);
diff --git a/Xext/saver.c b/Xext/saver.c
index 750b8b9..bf3a23d 100644
--- a/Xext/saver.c
+++ b/Xext/saver.c
@@ -426,7 +426,7 @@ SendScreenSaverNotify(ScreenPtr pScreen, int state, Bool forced)
     }
 }
 
-static void
+static void _X_COLD
 SScreenSaverNotifyEvent(xScreenSaverNotifyEvent * from,
                         xScreenSaverNotifyEvent * to)
 {
@@ -1277,7 +1277,7 @@ ProcScreenSaverDispatch(ClientPtr client)
     return BadRequest;
 }
 
-static int
+static int _X_COLD
 SProcScreenSaverQueryVersion(ClientPtr client)
 {
     REQUEST(xScreenSaverQueryVersionReq);
@@ -1286,7 +1286,7 @@ SProcScreenSaverQueryVersion(ClientPtr client)
     return ProcScreenSaverQueryVersion(client);
 }
 
-static int
+static int _X_COLD
 SProcScreenSaverQueryInfo(ClientPtr client)
 {
     REQUEST(xScreenSaverQueryInfoReq);
@@ -1296,7 +1296,7 @@ SProcScreenSaverQueryInfo(ClientPtr client)
     return ProcScreenSaverQueryInfo(client);
 }
 
-static int
+static int _X_COLD
 SProcScreenSaverSelectInput(ClientPtr client)
 {
     REQUEST(xScreenSaverSelectInputReq);
@@ -1307,7 +1307,7 @@ SProcScreenSaverSelectInput(ClientPtr client)
     return ProcScreenSaverSelectInput(client);
 }
 
-static int
+static int _X_COLD
 SProcScreenSaverSetAttributes(ClientPtr client)
 {
     REQUEST(xScreenSaverSetAttributesReq);
@@ -1325,7 +1325,7 @@ SProcScreenSaverSetAttributes(ClientPtr client)
     return ProcScreenSaverSetAttributes(client);
 }
 
-static int
+static int _X_COLD
 SProcScreenSaverUnsetAttributes(ClientPtr client)
 {
     REQUEST(xScreenSaverUnsetAttributesReq);
@@ -1335,7 +1335,7 @@ SProcScreenSaverUnsetAttributes(ClientPtr client)
     return ProcScreenSaverUnsetAttributes(client);
 }
 
-static int
+static int _X_COLD
 SProcScreenSaverSuspend(ClientPtr client)
 {
     REQUEST(xScreenSaverSuspendReq);
@@ -1352,7 +1352,7 @@ SProcScreenSaverQueryVersion,
         SProcScreenSaverSetAttributes,
         SProcScreenSaverUnsetAttributes, SProcScreenSaverSuspend,};
 
-static int
+static int _X_COLD
 SProcScreenSaverDispatch(ClientPtr client)
 {
     REQUEST(xReq);
diff --git a/Xext/security.c b/Xext/security.c
index 8cb3a2c..162d07a 100644
--- a/Xext/security.c
+++ b/Xext/security.c
@@ -601,7 +601,7 @@ ProcSecurityDispatch(ClientPtr client)
     }
 }                               /* ProcSecurityDispatch */
 
-static int
+static int _X_COLD
 SProcSecurityQueryVersion(ClientPtr client)
 {
     REQUEST(xSecurityQueryVersionReq);
@@ -613,7 +613,7 @@ SProcSecurityQueryVersion(ClientPtr client)
     return ProcSecurityQueryVersion(client);
 }                               /* SProcSecurityQueryVersion */
 
-static int
+static int _X_COLD
 SProcSecurityGenerateAuthorization(ClientPtr client)
 {
     REQUEST(xSecurityGenerateAuthorizationReq);
@@ -637,7 +637,7 @@ SProcSecurityGenerateAuthorization(ClientPtr client)
     return ProcSecurityGenerateAuthorization(client);
 }                               /* SProcSecurityGenerateAuthorization */
 
-static int
+static int _X_COLD
 SProcSecurityRevokeAuthorization(ClientPtr client)
 {
     REQUEST(xSecurityRevokeAuthorizationReq);
@@ -648,7 +648,7 @@ SProcSecurityRevokeAuthorization(ClientPtr client)
     return ProcSecurityRevokeAuthorization(client);
 }                               /* SProcSecurityRevokeAuthorization */
 
-static int
+static int _X_COLD
 SProcSecurityDispatch(ClientPtr client)
 {
     REQUEST(xReq);
@@ -665,7 +665,7 @@ SProcSecurityDispatch(ClientPtr client)
     }
 }                               /* SProcSecurityDispatch */
 
-static void
+static void _X_COLD
 SwapSecurityAuthorizationRevokedEvent(xSecurityAuthorizationRevokedEvent * from,
                                       xSecurityAuthorizationRevokedEvent * to)
 {
diff --git a/Xext/shape.c b/Xext/shape.c
index 142f9c1..e7c7a45 100644
--- a/Xext/shape.c
+++ b/Xext/shape.c
@@ -1074,7 +1074,7 @@ ProcShapeDispatch(ClientPtr client)
     }
 }
 
-static void
+static void _X_COLD
 SShapeNotifyEvent(xShapeNotifyEvent * from, xShapeNotifyEvent * to)
 {
     to->type = from->type;
@@ -1089,7 +1089,7 @@ SShapeNotifyEvent(xShapeNotifyEvent * from, xShapeNotifyEvent * to)
     to->shaped = from->shaped;
 }
 
-static int
+static int _X_COLD
 SProcShapeQueryVersion(ClientPtr client)
 {
     REQUEST(xShapeQueryVersionReq);
@@ -1098,7 +1098,7 @@ SProcShapeQueryVersion(ClientPtr client)
     return ProcShapeQueryVersion(client);
 }
 
-static int
+static int _X_COLD
 SProcShapeRectangles(ClientPtr client)
 {
     REQUEST(xShapeRectanglesReq);
@@ -1112,7 +1112,7 @@ SProcShapeRectangles(ClientPtr client)
     return ProcShapeRectangles(client);
 }
 
-static int
+static int _X_COLD
 SProcShapeMask(ClientPtr client)
 {
     REQUEST(xShapeMaskReq);
@@ -1126,7 +1126,7 @@ SProcShapeMask(ClientPtr client)
     return ProcShapeMask(client);
 }
 
-static int
+static int _X_COLD
 SProcShapeCombine(ClientPtr client)
 {
     REQUEST(xShapeCombineReq);
@@ -1140,7 +1140,7 @@ SProcShapeCombine(ClientPtr client)
     return ProcShapeCombine(client);
 }
 
-static int
+static int _X_COLD
 SProcShapeOffset(ClientPtr client)
 {
     REQUEST(xShapeOffsetReq);
@@ -1153,7 +1153,7 @@ SProcShapeOffset(ClientPtr client)
     return ProcShapeOffset(client);
 }
 
-static int
+static int _X_COLD
 SProcShapeQueryExtents(ClientPtr client)
 {
     REQUEST(xShapeQueryExtentsReq);
@@ -1164,7 +1164,7 @@ SProcShapeQueryExtents(ClientPtr client)
     return ProcShapeQueryExtents(client);
 }
 
-static int
+static int _X_COLD
 SProcShapeSelectInput(ClientPtr client)
 {
     REQUEST(xShapeSelectInputReq);
@@ -1175,7 +1175,7 @@ SProcShapeSelectInput(ClientPtr client)
     return ProcShapeSelectInput(client);
 }
 
-static int
+static int _X_COLD
 SProcShapeInputSelected(ClientPtr client)
 {
     REQUEST(xShapeInputSelectedReq);
@@ -1186,7 +1186,7 @@ SProcShapeInputSelected(ClientPtr client)
     return ProcShapeInputSelected(client);
 }
 
-static int
+static int _X_COLD
 SProcShapeGetRectangles(ClientPtr client)
 {
     REQUEST(xShapeGetRectanglesReq);
@@ -1196,7 +1196,7 @@ SProcShapeGetRectangles(ClientPtr client)
     return ProcShapeGetRectangles(client);
 }
 
-static int
+static int _X_COLD
 SProcShapeDispatch(ClientPtr client)
 {
     REQUEST(xReq);
diff --git a/Xext/shm.c b/Xext/shm.c
index 1b622e3..91ea90b 100644
--- a/Xext/shm.c
+++ b/Xext/shm.c
@@ -1336,7 +1336,7 @@ ProcShmDispatch(ClientPtr client)
     }
 }
 
-static void
+static void _X_COLD
 SShmCompletionEvent(xShmCompletionEvent * from, xShmCompletionEvent * to)
 {
     to->type = from->type;
@@ -1348,7 +1348,7 @@ SShmCompletionEvent(xShmCompletionEvent * from, xShmCompletionEvent * to)
     cpswapl(from->offset, to->offset);
 }
 
-static int
+static int _X_COLD
 SProcShmQueryVersion(ClientPtr client)
 {
     REQUEST(xShmQueryVersionReq);
@@ -1357,7 +1357,7 @@ SProcShmQueryVersion(ClientPtr client)
     return ProcShmQueryVersion(client);
 }
 
-static int
+static int _X_COLD
 SProcShmAttach(ClientPtr client)
 {
     REQUEST(xShmAttachReq);
@@ -1368,7 +1368,7 @@ SProcShmAttach(ClientPtr client)
     return ProcShmAttach(client);
 }
 
-static int
+static int _X_COLD
 SProcShmDetach(ClientPtr client)
 {
     REQUEST(xShmDetachReq);
@@ -1378,7 +1378,7 @@ SProcShmDetach(ClientPtr client)
     return ProcShmDetach(client);
 }
 
-static int
+static int _X_COLD
 SProcShmPutImage(ClientPtr client)
 {
     REQUEST(xShmPutImageReq);
@@ -1399,7 +1399,7 @@ SProcShmPutImage(ClientPtr client)
     return ProcShmPutImage(client);
 }
 
-static int
+static int _X_COLD
 SProcShmGetImage(ClientPtr client)
 {
     REQUEST(xShmGetImageReq);
@@ -1416,7 +1416,7 @@ SProcShmGetImage(ClientPtr client)
     return ProcShmGetImage(client);
 }
 
-static int
+static int _X_COLD
 SProcShmCreatePixmap(ClientPtr client)
 {
     REQUEST(xShmCreatePixmapReq);
@@ -1432,7 +1432,7 @@ SProcShmCreatePixmap(ClientPtr client)
 }
 
 #ifdef SHM_FD_PASSING
-static int
+static int _X_COLD
 SProcShmAttachFd(ClientPtr client)
 {
     REQUEST(xShmAttachFdReq);
@@ -1443,7 +1443,7 @@ SProcShmAttachFd(ClientPtr client)
     return ProcShmAttachFd(client);
 }
 
-static int
+static int _X_COLD
 SProcShmCreateSegment(ClientPtr client)
 {
     REQUEST(xShmCreateSegmentReq);
@@ -1455,7 +1455,7 @@ SProcShmCreateSegment(ClientPtr client)
 }
 #endif  /* SHM_FD_PASSING */
 
-static int
+static int _X_COLD
 SProcShmDispatch(ClientPtr client)
 {
     REQUEST(xReq);
diff --git a/Xext/sync.c b/Xext/sync.c
index 6335068..4c48359 100644
--- a/Xext/sync.c
+++ b/Xext/sync.c
@@ -2151,7 +2151,7 @@ ProcSyncDispatch(ClientPtr client)
  * Boring Swapping stuff ...
  */
 
-static int
+static int _X_COLD
 SProcSyncInitialize(ClientPtr client)
 {
     REQUEST(xSyncInitializeReq);
@@ -2161,7 +2161,7 @@ SProcSyncInitialize(ClientPtr client)
     return ProcSyncInitialize(client);
 }
 
-static int
+static int _X_COLD
 SProcSyncListSystemCounters(ClientPtr client)
 {
     REQUEST(xSyncListSystemCountersReq);
@@ -2171,7 +2171,7 @@ SProcSyncListSystemCounters(ClientPtr client)
     return ProcSyncListSystemCounters(client);
 }
 
-static int
+static int _X_COLD
 SProcSyncCreateCounter(ClientPtr client)
 {
     REQUEST(xSyncCreateCounterReq);
@@ -2184,7 +2184,7 @@ SProcSyncCreateCounter(ClientPtr client)
     return ProcSyncCreateCounter(client);
 }
 
-static int
+static int _X_COLD
 SProcSyncSetCounter(ClientPtr client)
 {
     REQUEST(xSyncSetCounterReq);
@@ -2197,7 +2197,7 @@ SProcSyncSetCounter(ClientPtr client)
     return ProcSyncSetCounter(client);
 }
 
-static int
+static int _X_COLD
 SProcSyncChangeCounter(ClientPtr client)
 {
     REQUEST(xSyncChangeCounterReq);
@@ -2210,7 +2210,7 @@ SProcSyncChangeCounter(ClientPtr client)
     return ProcSyncChangeCounter(client);
 }
 
-static int
+static int _X_COLD
 SProcSyncQueryCounter(ClientPtr client)
 {
     REQUEST(xSyncQueryCounterReq);
@@ -2221,7 +2221,7 @@ SProcSyncQueryCounter(ClientPtr client)
     return ProcSyncQueryCounter(client);
 }
 
-static int
+static int _X_COLD
 SProcSyncDestroyCounter(ClientPtr client)
 {
     REQUEST(xSyncDestroyCounterReq);
@@ -2232,7 +2232,7 @@ SProcSyncDestroyCounter(ClientPtr client)
     return ProcSyncDestroyCounter(client);
 }
 
-static int
+static int _X_COLD
 SProcSyncAwait(ClientPtr client)
 {
     REQUEST(xSyncAwaitReq);
@@ -2243,7 +2243,7 @@ SProcSyncAwait(ClientPtr client)
     return ProcSyncAwait(client);
 }
 
-static int
+static int _X_COLD
 SProcSyncCreateAlarm(ClientPtr client)
 {
     REQUEST(xSyncCreateAlarmReq);
@@ -2256,7 +2256,7 @@ SProcSyncCreateAlarm(ClientPtr client)
     return ProcSyncCreateAlarm(client);
 }
 
-static int
+static int _X_COLD
 SProcSyncChangeAlarm(ClientPtr client)
 {
     REQUEST(xSyncChangeAlarmReq);
@@ -2268,7 +2268,7 @@ SProcSyncChangeAlarm(ClientPtr client)
     return ProcSyncChangeAlarm(client);
 }
 
-static int
+static int _X_COLD
 SProcSyncQueryAlarm(ClientPtr client)
 {
     REQUEST(xSyncQueryAlarmReq);
@@ -2279,7 +2279,7 @@ SProcSyncQueryAlarm(ClientPtr client)
     return ProcSyncQueryAlarm(client);
 }
 
-static int
+static int _X_COLD
 SProcSyncDestroyAlarm(ClientPtr client)
 {
     REQUEST(xSyncDestroyAlarmReq);
@@ -2290,7 +2290,7 @@ SProcSyncDestroyAlarm(ClientPtr client)
     return ProcSyncDestroyAlarm(client);
 }
 
-static int
+static int _X_COLD
 SProcSyncSetPriority(ClientPtr client)
 {
     REQUEST(xSyncSetPriorityReq);
@@ -2302,7 +2302,7 @@ SProcSyncSetPriority(ClientPtr client)
     return ProcSyncSetPriority(client);
 }
 
-static int
+static int _X_COLD
 SProcSyncGetPriority(ClientPtr client)
 {
     REQUEST(xSyncGetPriorityReq);
@@ -2313,7 +2313,7 @@ SProcSyncGetPriority(ClientPtr client)
     return ProcSyncGetPriority(client);
 }
 
-static int
+static int _X_COLD
 SProcSyncCreateFence(ClientPtr client)
 {
     REQUEST(xSyncCreateFenceReq);
@@ -2324,7 +2324,7 @@ SProcSyncCreateFence(ClientPtr client)
     return ProcSyncCreateFence(client);
 }
 
-static int
+static int _X_COLD
 SProcSyncTriggerFence(ClientPtr client)
 {
     REQUEST(xSyncTriggerFenceReq);
@@ -2335,7 +2335,7 @@ SProcSyncTriggerFence(ClientPtr client)
     return ProcSyncTriggerFence(client);
 }
 
-static int
+static int _X_COLD
 SProcSyncResetFence(ClientPtr client)
 {
     REQUEST(xSyncResetFenceReq);
@@ -2346,7 +2346,7 @@ SProcSyncResetFence(ClientPtr client)
     return ProcSyncResetFence(client);
 }
 
-static int
+static int _X_COLD
 SProcSyncDestroyFence(ClientPtr client)
 {
     REQUEST(xSyncDestroyFenceReq);
@@ -2357,7 +2357,7 @@ SProcSyncDestroyFence(ClientPtr client)
     return ProcSyncDestroyFence(client);
 }
 
-static int
+static int _X_COLD
 SProcSyncQueryFence(ClientPtr client)
 {
     REQUEST(xSyncQueryFenceReq);
@@ -2368,7 +2368,7 @@ SProcSyncQueryFence(ClientPtr client)
     return ProcSyncQueryFence(client);
 }
 
-static int
+static int _X_COLD
 SProcSyncAwaitFence(ClientPtr client)
 {
     REQUEST(xSyncAwaitFenceReq);
@@ -2379,7 +2379,7 @@ SProcSyncAwaitFence(ClientPtr client)
     return ProcSyncAwaitFence(client);
 }
 
-static int
+static int _X_COLD
 SProcSyncDispatch(ClientPtr client)
 {
     REQUEST(xReq);
@@ -2434,7 +2434,7 @@ SProcSyncDispatch(ClientPtr client)
  * Event Swapping
  */
 
-static void
+static void _X_COLD
 SCounterNotifyEvent(xSyncCounterNotifyEvent * from,
                     xSyncCounterNotifyEvent * to)
 {
@@ -2451,7 +2451,7 @@ SCounterNotifyEvent(xSyncCounterNotifyEvent * from,
     to->destroyed = from->destroyed;
 }
 
-static void
+static void _X_COLD
 SAlarmNotifyEvent(xSyncAlarmNotifyEvent * from, xSyncAlarmNotifyEvent * to)
 {
     to->type = from->type;
diff --git a/Xext/vidmode.c b/Xext/vidmode.c
index ea3ad13..8ba919a 100644
--- a/Xext/vidmode.c
+++ b/Xext/vidmode.c
@@ -1692,7 +1692,7 @@ ProcVidModeDispatch(ClientPtr client)
     }
 }
 
-static int
+static int _X_COLD
 SProcVidModeQueryVersion(ClientPtr client)
 {
     REQUEST(xXF86VidModeQueryVersionReq);
@@ -1700,7 +1700,7 @@ SProcVidModeQueryVersion(ClientPtr client)
     return ProcVidModeQueryVersion(client);
 }
 
-static int
+static int _X_COLD
 SProcVidModeGetModeLine(ClientPtr client)
 {
     REQUEST(xXF86VidModeGetModeLineReq);
@@ -1710,7 +1710,7 @@ SProcVidModeGetModeLine(ClientPtr client)
     return ProcVidModeGetModeLine(client);
 }
 
-static int
+static int _X_COLD
 SProcVidModeGetAllModeLines(ClientPtr client)
 {
     REQUEST(xXF86VidModeGetAllModeLinesReq);
@@ -1720,7 +1720,7 @@ SProcVidModeGetAllModeLines(ClientPtr client)
     return ProcVidModeGetAllModeLines(client);
 }
 
-static int
+static int _X_COLD
 SProcVidModeAddModeLine(ClientPtr client)
 {
     xXF86OldVidModeAddModeLineReq *oldstuff =
@@ -1765,7 +1765,7 @@ SProcVidModeAddModeLine(ClientPtr client)
     return ProcVidModeAddModeLine(client);
 }
 
-static int
+static int _X_COLD
 SProcVidModeDeleteModeLine(ClientPtr client)
 {
     xXF86OldVidModeDeleteModeLineReq *oldstuff =
@@ -1810,7 +1810,7 @@ SProcVidModeDeleteModeLine(ClientPtr client)
     return ProcVidModeDeleteModeLine(client);
 }
 
-static int
+static int _X_COLD
 SProcVidModeModModeLine(ClientPtr client)
 {
     xXF86OldVidModeModModeLineReq *oldstuff =
@@ -1855,7 +1855,7 @@ SProcVidModeModModeLine(ClientPtr client)
     return ProcVidModeModModeLine(client);
 }
 
-static int
+static int _X_COLD
 SProcVidModeValidateModeLine(ClientPtr client)
 {
     xXF86OldVidModeValidateModeLineReq *oldstuff =
@@ -1900,7 +1900,7 @@ SProcVidModeValidateModeLine(ClientPtr client)
     return ProcVidModeValidateModeLine(client);
 }
 
-static int
+static int _X_COLD
 SProcVidModeSwitchMode(ClientPtr client)
 {
     REQUEST(xXF86VidModeSwitchModeReq);
@@ -1911,7 +1911,7 @@ SProcVidModeSwitchMode(ClientPtr client)
     return ProcVidModeSwitchMode(client);
 }
 
-static int
+static int _X_COLD
 SProcVidModeSwitchToMode(ClientPtr client)
 {
     REQUEST(xXF86VidModeSwitchToModeReq);
@@ -1921,7 +1921,7 @@ SProcVidModeSwitchToMode(ClientPtr client)
     return ProcVidModeSwitchToMode(client);
 }
 
-static int
+static int _X_COLD
 SProcVidModeLockModeSwitch(ClientPtr client)
 {
     REQUEST(xXF86VidModeLockModeSwitchReq);
@@ -1932,7 +1932,7 @@ SProcVidModeLockModeSwitch(ClientPtr client)
     return ProcVidModeLockModeSwitch(client);
 }
 
-static int
+static int _X_COLD
 SProcVidModeGetMonitor(ClientPtr client)
 {
     REQUEST(xXF86VidModeGetMonitorReq);
@@ -1942,7 +1942,7 @@ SProcVidModeGetMonitor(ClientPtr client)
     return ProcVidModeGetMonitor(client);
 }
 
-static int
+static int _X_COLD
 SProcVidModeGetViewPort(ClientPtr client)
 {
     REQUEST(xXF86VidModeGetViewPortReq);
@@ -1952,7 +1952,7 @@ SProcVidModeGetViewPort(ClientPtr client)
     return ProcVidModeGetViewPort(client);
 }
 
-static int
+static int _X_COLD
 SProcVidModeSetViewPort(ClientPtr client)
 {
     REQUEST(xXF86VidModeSetViewPortReq);
@@ -1964,7 +1964,7 @@ SProcVidModeSetViewPort(ClientPtr client)
     return ProcVidModeSetViewPort(client);
 }
 
-static int
+static int _X_COLD
 SProcVidModeGetDotClocks(ClientPtr client)
 {
     REQUEST(xXF86VidModeGetDotClocksReq);
@@ -1974,7 +1974,7 @@ SProcVidModeGetDotClocks(ClientPtr client)
     return ProcVidModeGetDotClocks(client);
 }
 
-static int
+static int _X_COLD
 SProcVidModeSetClientVersion(ClientPtr client)
 {
     REQUEST(xXF86VidModeSetClientVersionReq);
@@ -1985,7 +1985,7 @@ SProcVidModeSetClientVersion(ClientPtr client)
     return ProcVidModeSetClientVersion(client);
 }
 
-static int
+static int _X_COLD
 SProcVidModeSetGamma(ClientPtr client)
 {
     REQUEST(xXF86VidModeSetGammaReq);
@@ -1998,7 +1998,7 @@ SProcVidModeSetGamma(ClientPtr client)
     return ProcVidModeSetGamma(client);
 }
 
-static int
+static int _X_COLD
 SProcVidModeGetGamma(ClientPtr client)
 {
     REQUEST(xXF86VidModeGetGammaReq);
@@ -2008,7 +2008,7 @@ SProcVidModeGetGamma(ClientPtr client)
     return ProcVidModeGetGamma(client);
 }
 
-static int
+static int _X_COLD
 SProcVidModeSetGammaRamp(ClientPtr client)
 {
     int length;
@@ -2024,7 +2024,7 @@ SProcVidModeSetGammaRamp(ClientPtr client)
     return ProcVidModeSetGammaRamp(client);
 }
 
-static int
+static int _X_COLD
 SProcVidModeGetGammaRamp(ClientPtr client)
 {
     REQUEST(xXF86VidModeGetGammaRampReq);
@@ -2035,7 +2035,7 @@ SProcVidModeGetGammaRamp(ClientPtr client)
     return ProcVidModeGetGammaRamp(client);
 }
 
-static int
+static int _X_COLD
 SProcVidModeGetGammaRampSize(ClientPtr client)
 {
     REQUEST(xXF86VidModeGetGammaRampSizeReq);
@@ -2045,7 +2045,7 @@ SProcVidModeGetGammaRampSize(ClientPtr client)
     return ProcVidModeGetGammaRampSize(client);
 }
 
-static int
+static int _X_COLD
 SProcVidModeGetPermissions(ClientPtr client)
 {
     REQUEST(xXF86VidModeGetPermissionsReq);
@@ -2055,7 +2055,7 @@ SProcVidModeGetPermissions(ClientPtr client)
     return ProcVidModeGetPermissions(client);
 }
 
-static int
+static int _X_COLD
 SProcVidModeDispatch(ClientPtr client)
 {
     REQUEST(xReq);
diff --git a/Xext/xcmisc.c b/Xext/xcmisc.c
index ed25650..c3c0b7f 100644
--- a/Xext/xcmisc.c
+++ b/Xext/xcmisc.c
@@ -142,7 +142,7 @@ ProcXCMiscDispatch(ClientPtr client)
     }
 }
 
-static int
+static int _X_COLD
 SProcXCMiscGetVersion(ClientPtr client)
 {
     REQUEST(xXCMiscGetVersionReq);
@@ -154,7 +154,7 @@ SProcXCMiscGetVersion(ClientPtr client)
     return ProcXCMiscGetVersion(client);
 }
 
-static int
+static int _X_COLD
 SProcXCMiscGetXIDRange(ClientPtr client)
 {
     REQUEST(xReq);
@@ -163,7 +163,7 @@ SProcXCMiscGetXIDRange(ClientPtr client)
     return ProcXCMiscGetXIDRange(client);
 }
 
-static int
+static int _X_COLD
 SProcXCMiscGetXIDList(ClientPtr client)
 {
     REQUEST(xXCMiscGetXIDListReq);
@@ -174,7 +174,7 @@ SProcXCMiscGetXIDList(ClientPtr client)
     return ProcXCMiscGetXIDList(client);
 }
 
-static int
+static int _X_COLD
 SProcXCMiscDispatch(ClientPtr client)
 {
     REQUEST(xReq);
diff --git a/Xext/xf86bigfont.c b/Xext/xf86bigfont.c
index f2584c2..72bb774 100644
--- a/Xext/xf86bigfont.c
+++ b/Xext/xf86bigfont.c
@@ -657,7 +657,7 @@ ProcXF86BigfontDispatch(ClientPtr client)
     }
 }
 
-static int
+static int _X_COLD
 SProcXF86BigfontQueryVersion(ClientPtr client)
 {
     REQUEST(xXF86BigfontQueryVersionReq);
@@ -666,7 +666,7 @@ SProcXF86BigfontQueryVersion(ClientPtr client)
     return ProcXF86BigfontQueryVersion(client);
 }
 
-static int
+static int _X_COLD
 SProcXF86BigfontQueryFont(ClientPtr client)
 {
     REQUEST(xXF86BigfontQueryFontReq);
@@ -677,7 +677,7 @@ SProcXF86BigfontQueryFont(ClientPtr client)
     return ProcXF86BigfontQueryFont(client);
 }
 
-static int
+static int _X_COLD
 SProcXF86BigfontDispatch(ClientPtr client)
 {
     REQUEST(xReq);
diff --git a/Xext/xres.c b/Xext/xres.c
index ae779df..21239f5 100644
--- a/Xext/xres.c
+++ b/Xext/xres.c
@@ -1007,14 +1007,14 @@ ProcResDispatch(ClientPtr client)
     return BadRequest;
 }
 
-static int
+static int _X_COLD
 SProcXResQueryVersion(ClientPtr client)
 {
     REQUEST_SIZE_MATCH(xXResQueryVersionReq);
     return ProcXResQueryVersion(client);
 }
 
-static int
+static int _X_COLD
 SProcXResQueryClientResources(ClientPtr client)
 {
     REQUEST(xXResQueryClientResourcesReq);
@@ -1023,7 +1023,7 @@ SProcXResQueryClientResources(ClientPtr client)
     return ProcXResQueryClientResources(client);
 }
 
-static int
+static int _X_COLD
 SProcXResQueryClientPixmapBytes(ClientPtr client)
 {
     REQUEST(xXResQueryClientPixmapBytesReq);
@@ -1032,7 +1032,7 @@ SProcXResQueryClientPixmapBytes(ClientPtr client)
     return ProcXResQueryClientPixmapBytes(client);
 }
 
-static int
+static int _X_COLD
 SProcXResQueryClientIds (ClientPtr client)
 {
     REQUEST(xXResQueryClientIdsReq);
@@ -1045,7 +1045,7 @@ SProcXResQueryClientIds (ClientPtr client)
 /** @brief Implements the XResQueryResourceBytes of XResProto v1.2.
     This variant byteswaps request contents before issuing the
     rest of the work to ProcXResQueryResourceBytes */
-static int
+static int _X_COLD
 SProcXResQueryResourceBytes (ClientPtr client)
 {
     REQUEST(xXResQueryResourceBytesReq);
@@ -1064,7 +1064,7 @@ SProcXResQueryResourceBytes (ClientPtr client)
     return ProcXResQueryResourceBytes(client);
 }
 
-static int
+static int _X_COLD
 SProcResDispatch (ClientPtr client)
 {
     REQUEST(xReq);
diff --git a/Xext/xselinux_ext.c b/Xext/xselinux_ext.c
index fb7b2d5..6325634 100644
--- a/Xext/xselinux_ext.c
+++ b/Xext/xselinux_ext.c
@@ -528,13 +528,13 @@ ProcSELinuxDispatch(ClientPtr client)
     }
 }
 
-static int
+static int _X_COLD
 SProcSELinuxQueryVersion(ClientPtr client)
 {
     return ProcSELinuxQueryVersion(client);
 }
 
-static int
+static int _X_COLD
 SProcSELinuxSetCreateContext(ClientPtr client, unsigned offset)
 {
     REQUEST(SELinuxSetCreateContextReq);
@@ -544,7 +544,7 @@ SProcSELinuxSetCreateContext(ClientPtr client, unsigned offset)
     return ProcSELinuxSetCreateContext(client, offset);
 }
 
-static int
+static int _X_COLD
 SProcSELinuxSetDeviceContext(ClientPtr client)
 {
     REQUEST(SELinuxSetContextReq);
@@ -555,7 +555,7 @@ SProcSELinuxSetDeviceContext(ClientPtr client)
     return ProcSELinuxSetDeviceContext(client);
 }
 
-static int
+static int _X_COLD
 SProcSELinuxGetDeviceContext(ClientPtr client)
 {
     REQUEST(SELinuxGetContextReq);
@@ -565,7 +565,7 @@ SProcSELinuxGetDeviceContext(ClientPtr client)
     return ProcSELinuxGetDeviceContext(client);
 }
 
-static int
+static int _X_COLD
 SProcSELinuxGetDrawableContext(ClientPtr client)
 {
     REQUEST(SELinuxGetContextReq);
@@ -575,7 +575,7 @@ SProcSELinuxGetDrawableContext(ClientPtr client)
     return ProcSELinuxGetDrawableContext(client);
 }
 
-static int
+static int _X_COLD
 SProcSELinuxGetPropertyContext(ClientPtr client, void *privKey)
 {
     REQUEST(SELinuxGetPropertyContextReq);
@@ -586,7 +586,7 @@ SProcSELinuxGetPropertyContext(ClientPtr client, void *privKey)
     return ProcSELinuxGetPropertyContext(client, privKey);
 }
 
-static int
+static int _X_COLD
 SProcSELinuxGetSelectionContext(ClientPtr client, void *privKey)
 {
     REQUEST(SELinuxGetContextReq);
@@ -596,7 +596,7 @@ SProcSELinuxGetSelectionContext(ClientPtr client, void *privKey)
     return ProcSELinuxGetSelectionContext(client, privKey);
 }
 
-static int
+static int _X_COLD
 SProcSELinuxListProperties(ClientPtr client)
 {
     REQUEST(SELinuxGetContextReq);
@@ -606,7 +606,7 @@ SProcSELinuxListProperties(ClientPtr client)
     return ProcSELinuxListProperties(client);
 }
 
-static int
+static int _X_COLD
 SProcSELinuxGetClientContext(ClientPtr client)
 {
     REQUEST(SELinuxGetContextReq);
@@ -616,7 +616,7 @@ SProcSELinuxGetClientContext(ClientPtr client)
     return ProcSELinuxGetClientContext(client);
 }
 
-static int
+static int _X_COLD
 SProcSELinuxDispatch(ClientPtr client)
 {
     REQUEST(xReq);
diff --git a/Xext/xtest.c b/Xext/xtest.c
index 2371a69..38b8012 100644
--- a/Xext/xtest.c
+++ b/Xext/xtest.c
@@ -468,7 +468,7 @@ ProcXTestDispatch(ClientPtr client)
     }
 }
 
-static int
+static int _X_COLD
 SProcXTestGetVersion(ClientPtr client)
 {
     REQUEST(xXTestGetVersionReq);
@@ -479,7 +479,7 @@ SProcXTestGetVersion(ClientPtr client)
     return ProcXTestGetVersion(client);
 }
 
-static int
+static int _X_COLD
 SProcXTestCompareCursor(ClientPtr client)
 {
     REQUEST(xXTestCompareCursorReq);
@@ -491,7 +491,7 @@ SProcXTestCompareCursor(ClientPtr client)
     return ProcXTestCompareCursor(client);
 }
 
-static int
+static int _X_COLD
 XTestSwapFakeInput(ClientPtr client, xReq * req)
 {
     int nev;
@@ -514,7 +514,7 @@ XTestSwapFakeInput(ClientPtr client, xReq * req)
     return Success;
 }
 
-static int
+static int _X_COLD
 SProcXTestFakeInput(ClientPtr client)
 {
     int n;
@@ -528,7 +528,7 @@ SProcXTestFakeInput(ClientPtr client)
     return ProcXTestFakeInput(client);
 }
 
-static int
+static int _X_COLD
 SProcXTestGrabControl(ClientPtr client)
 {
     REQUEST(xXTestGrabControlReq);
@@ -538,7 +538,7 @@ SProcXTestGrabControl(ClientPtr client)
     return ProcXTestGrabControl(client);
 }
 
-static int
+static int _X_COLD
 SProcXTestDispatch(ClientPtr client)
 {
     REQUEST(xReq);
diff --git a/Xext/xvdisp.c b/Xext/xvdisp.c
index 8a35b7b..d99d3d4 100644
--- a/Xext/xvdisp.c
+++ b/Xext/xvdisp.c
@@ -1115,7 +1115,7 @@ ProcXvDispatch(ClientPtr client)
 
 /* Swapped Procs */
 
-static int
+static int _X_COLD
 SProcXvQueryExtension(ClientPtr client)
 {
     REQUEST(xvQueryExtensionReq);
@@ -1124,7 +1124,7 @@ SProcXvQueryExtension(ClientPtr client)
     return XvProcVector[xv_QueryExtension] (client);
 }
 
-static int
+static int _X_COLD
 SProcXvQueryAdaptors(ClientPtr client)
 {
     REQUEST(xvQueryAdaptorsReq);
@@ -1134,7 +1134,7 @@ SProcXvQueryAdaptors(ClientPtr client)
     return XvProcVector[xv_QueryAdaptors] (client);
 }
 
-static int
+static int _X_COLD
 SProcXvQueryEncodings(ClientPtr client)
 {
     REQUEST(xvQueryEncodingsReq);
@@ -1144,7 +1144,7 @@ SProcXvQueryEncodings(ClientPtr client)
     return XvProcVector[xv_QueryEncodings] (client);
 }
 
-static int
+static int _X_COLD
 SProcXvGrabPort(ClientPtr client)
 {
     REQUEST(xvGrabPortReq);
@@ -1155,7 +1155,7 @@ SProcXvGrabPort(ClientPtr client)
     return XvProcVector[xv_GrabPort] (client);
 }
 
-static int
+static int _X_COLD
 SProcXvUngrabPort(ClientPtr client)
 {
     REQUEST(xvUngrabPortReq);
@@ -1166,7 +1166,7 @@ SProcXvUngrabPort(ClientPtr client)
     return XvProcVector[xv_UngrabPort] (client);
 }
 
-static int
+static int _X_COLD
 SProcXvPutVideo(ClientPtr client)
 {
     REQUEST(xvPutVideoReq);
@@ -1186,7 +1186,7 @@ SProcXvPutVideo(ClientPtr client)
     return XvProcVector[xv_PutVideo] (client);
 }
 
-static int
+static int _X_COLD
 SProcXvPutStill(ClientPtr client)
 {
     REQUEST(xvPutStillReq);
@@ -1206,7 +1206,7 @@ SProcXvPutStill(ClientPtr client)
     return XvProcVector[xv_PutStill] (client);
 }
 
-static int
+static int _X_COLD
 SProcXvGetVideo(ClientPtr client)
 {
     REQUEST(xvGetVideoReq);
@@ -1226,7 +1226,7 @@ SProcXvGetVideo(ClientPtr client)
     return XvProcVector[xv_GetVideo] (client);
 }
 
-static int
+static int _X_COLD
 SProcXvGetStill(ClientPtr client)
 {
     REQUEST(xvGetStillReq);
@@ -1246,7 +1246,7 @@ SProcXvGetStill(ClientPtr client)
     return XvProcVector[xv_GetStill] (client);
 }
 
-static int
+static int _X_COLD
 SProcXvPutImage(ClientPtr client)
 {
     REQUEST(xvPutImageReq);
@@ -1270,7 +1270,7 @@ SProcXvPutImage(ClientPtr client)
 }
 
 #ifdef MITSHM
-static int
+static int _X_COLD
 SProcXvShmPutImage(ClientPtr client)
 {
     REQUEST(xvShmPutImageReq);
@@ -1298,7 +1298,7 @@ SProcXvShmPutImage(ClientPtr client)
 #define SProcXvShmPutImage ProcXvShmPutImage
 #endif
 
-static int
+static int _X_COLD
 SProcXvSelectVideoNotify(ClientPtr client)
 {
     REQUEST(xvSelectVideoNotifyReq);
@@ -1308,7 +1308,7 @@ SProcXvSelectVideoNotify(ClientPtr client)
     return XvProcVector[xv_SelectVideoNotify] (client);
 }
 
-static int
+static int _X_COLD
 SProcXvSelectPortNotify(ClientPtr client)
 {
     REQUEST(xvSelectPortNotifyReq);
@@ -1318,7 +1318,7 @@ SProcXvSelectPortNotify(ClientPtr client)
     return XvProcVector[xv_SelectPortNotify] (client);
 }
 
-static int
+static int _X_COLD
 SProcXvStopVideo(ClientPtr client)
 {
     REQUEST(xvStopVideoReq);
@@ -1329,7 +1329,7 @@ SProcXvStopVideo(ClientPtr client)
     return XvProcVector[xv_StopVideo] (client);
 }
 
-static int
+static int _X_COLD
 SProcXvSetPortAttribute(ClientPtr client)
 {
     REQUEST(xvSetPortAttributeReq);
@@ -1341,7 +1341,7 @@ SProcXvSetPortAttribute(ClientPtr client)
     return XvProcVector[xv_SetPortAttribute] (client);
 }
 
-static int
+static int _X_COLD
 SProcXvGetPortAttribute(ClientPtr client)
 {
     REQUEST(xvGetPortAttributeReq);
@@ -1352,7 +1352,7 @@ SProcXvGetPortAttribute(ClientPtr client)
     return XvProcVector[xv_GetPortAttribute] (client);
 }
 
-static int
+static int _X_COLD
 SProcXvQueryBestSize(ClientPtr client)
 {
     REQUEST(xvQueryBestSizeReq);
@@ -1366,7 +1366,7 @@ SProcXvQueryBestSize(ClientPtr client)
     return XvProcVector[xv_QueryBestSize] (client);
 }
 
-static int
+static int _X_COLD
 SProcXvQueryPortAttributes(ClientPtr client)
 {
     REQUEST(xvQueryPortAttributesReq);
@@ -1376,7 +1376,7 @@ SProcXvQueryPortAttributes(ClientPtr client)
     return XvProcVector[xv_QueryPortAttributes] (client);
 }
 
-static int
+static int _X_COLD
 SProcXvQueryImageAttributes(ClientPtr client)
 {
     REQUEST(xvQueryImageAttributesReq);
@@ -1389,7 +1389,7 @@ SProcXvQueryImageAttributes(ClientPtr client)
     return XvProcVector[xv_QueryImageAttributes] (client);
 }
 
-static int
+static int _X_COLD
 SProcXvListImageFormats(ClientPtr client)
 {
     REQUEST(xvListImageFormatsReq);
@@ -1419,7 +1419,7 @@ SProcXvQueryExtension,
         SProcXvListImageFormats,
         SProcXvQueryImageAttributes, SProcXvPutImage, SProcXvShmPutImage,};
 
-int
+int _X_COLD
 SProcXvDispatch(ClientPtr client)
 {
     REQUEST(xReq);
diff --git a/Xext/xvmain.c b/Xext/xvmain.c
index c9b11d4..c520c7d2 100644
--- a/Xext/xvmain.c
+++ b/Xext/xvmain.c
@@ -984,7 +984,7 @@ XvdiGetPortAttribute(ClientPtr client,
 
 }
 
-static void
+static void _X_COLD
 WriteSwappedVideoNotifyEvent(xvEvent * from, xvEvent * to)
 {
 
@@ -998,7 +998,7 @@ WriteSwappedVideoNotifyEvent(xvEvent * from, xvEvent * to)
 
 }
 
-static void
+static void _X_COLD
 WriteSwappedPortNotifyEvent(xvEvent * from, xvEvent * to)
 {
 
diff --git a/Xext/xvmc.c b/Xext/xvmc.c
index 7565c17..c7338b7 100644
--- a/Xext/xvmc.c
+++ b/Xext/xvmc.c
@@ -690,7 +690,7 @@ ProcXvMCDispatch(ClientPtr client)
         return BadRequest;
 }
 
-static int
+static int _X_COLD
 SProcXvMCDispatch(ClientPtr client)
 {
     /* We only support local */
diff --git a/Xi/allowev.c b/Xi/allowev.c
index 770fe9f..c25edb3 100644
--- a/Xi/allowev.c
+++ b/Xi/allowev.c
@@ -69,7 +69,7 @@ SOFTWARE.
  *
  */
 
-int
+int _X_COLD
 SProcXAllowDeviceEvents(ClientPtr client)
 {
     REQUEST(xAllowDeviceEventsReq);
diff --git a/Xi/chgdctl.c b/Xi/chgdctl.c
index b3ee867..a778fa3 100644
--- a/Xi/chgdctl.c
+++ b/Xi/chgdctl.c
@@ -71,7 +71,7 @@ SOFTWARE.
  *
  */
 
-int
+int _X_COLD
 SProcXChangeDeviceControl(ClientPtr client)
 {
     xDeviceCtl *ctl;
@@ -247,7 +247,7 @@ ProcXChangeDeviceControl(ClientPtr client)
  *
  */
 
-void
+void _X_COLD
 SRepXChangeDeviceControl(ClientPtr client, int size,
                          xChangeDeviceControlReply * rep)
 {
diff --git a/Xi/chgfctl.c b/Xi/chgfctl.c
index 224c2ba..1de4da9 100644
--- a/Xi/chgfctl.c
+++ b/Xi/chgfctl.c
@@ -71,7 +71,7 @@ SOFTWARE.
  *
  */
 
-int
+int _X_COLD
 SProcXChangeFeedbackControl(ClientPtr client)
 {
     REQUEST(xChangeFeedbackControlReq);
diff --git a/Xi/chgkbd.c b/Xi/chgkbd.c
index ea91eb3..4f5abd7 100644
--- a/Xi/chgkbd.c
+++ b/Xi/chgkbd.c
@@ -72,7 +72,7 @@ SOFTWARE.
  *
  */
 
-int
+int _X_COLD
 SProcXChangeKeyboardDevice(ClientPtr client)
 {
     REQUEST(xChangeKeyboardDeviceReq);
diff --git a/Xi/chgkmap.c b/Xi/chgkmap.c
index 49660f9..befe6e7 100644
--- a/Xi/chgkmap.c
+++ b/Xi/chgkmap.c
@@ -69,7 +69,7 @@ SOFTWARE.
  *
  */
 
-int
+int _X_COLD
 SProcXChangeDeviceKeyMapping(ClientPtr client)
 {
     unsigned int count;
diff --git a/Xi/chgprop.c b/Xi/chgprop.c
index 84fb51d..1d72770 100644
--- a/Xi/chgprop.c
+++ b/Xi/chgprop.c
@@ -71,7 +71,7 @@ SOFTWARE.
  *
  */
 
-int
+int _X_COLD
 SProcXChangeDeviceDontPropagateList(ClientPtr client)
 {
     REQUEST(xChangeDeviceDontPropagateListReq);
diff --git a/Xi/chgptr.c b/Xi/chgptr.c
index f99d1aa..06047a6 100644
--- a/Xi/chgptr.c
+++ b/Xi/chgptr.c
@@ -74,7 +74,7 @@ SOFTWARE.
  *
  */
 
-int
+int _X_COLD
 SProcXChangePointerDevice(ClientPtr client)
 {
     REQUEST(xChangePointerDeviceReq);
diff --git a/Xi/closedev.c b/Xi/closedev.c
index 154e6ce..199d38a 100644
--- a/Xi/closedev.c
+++ b/Xi/closedev.c
@@ -70,7 +70,7 @@ SOFTWARE.
  *
  */
 
-int
+int _X_COLD
 SProcXCloseDevice(ClientPtr client)
 {
     REQUEST(xCloseDeviceReq);
diff --git a/Xi/devbell.c b/Xi/devbell.c
index 07865d2..2e2a348 100644
--- a/Xi/devbell.c
+++ b/Xi/devbell.c
@@ -68,7 +68,7 @@ SOFTWARE.
  *
  */
 
-int
+int _X_COLD
 SProcXDeviceBell(ClientPtr client)
 {
     REQUEST(xDeviceBellReq);
diff --git a/Xi/extinit.c b/Xi/extinit.c
index 7a86ee2..33dacbe 100644
--- a/Xi/extinit.c
+++ b/Xi/extinit.c
@@ -407,7 +407,7 @@ ProcIDispatch(ClientPtr client)
  *
  */
 
-static int
+static int _X_COLD
 SProcIDispatch(ClientPtr client)
 {
     REQUEST(xReq);
@@ -425,7 +425,7 @@ SProcIDispatch(ClientPtr client)
  *
  */
 
-static void
+static void _X_COLD
 SReplyIDispatch(ClientPtr client, int len, xGrabDeviceReply * rep)
 {
     /* All we look at is the type field */
@@ -859,7 +859,7 @@ SBarrierEvent(xXIBarrierEvent * from,
 }
 
 /** Event swapping function for XI2 events. */
-void
+void _X_COLD
 XI2EventSwap(xGenericEvent *from, xGenericEvent *to)
 {
     switch (from->evtype) {
@@ -1202,7 +1202,7 @@ MakeDeviceTypeAtoms(void)
  */
 #define DO_SWAP(func,type) func ((type *)from, (type *)to)
 
-static void
+static void _X_COLD
 SEventIDispatch(xEvent *from, xEvent *to)
 {
     int type = from->u.u.type & 0177;
diff --git a/Xi/getbmap.c b/Xi/getbmap.c
index 49b8688..ce3e9e6 100644
--- a/Xi/getbmap.c
+++ b/Xi/getbmap.c
@@ -67,7 +67,7 @@ SOFTWARE.
  *
  */
 
-int
+int _X_COLD
 SProcXGetDeviceButtonMapping(ClientPtr client)
 {
     REQUEST(xGetDeviceButtonMappingReq);
@@ -122,7 +122,7 @@ ProcXGetDeviceButtonMapping(ClientPtr client)
  *
  */
 
-void
+void _X_COLD
 SRepXGetDeviceButtonMapping(ClientPtr client, int size,
                             xGetDeviceButtonMappingReply * rep)
 {
diff --git a/Xi/getdctl.c b/Xi/getdctl.c
index 6f73e09..149f5e1 100644
--- a/Xi/getdctl.c
+++ b/Xi/getdctl.c
@@ -68,7 +68,7 @@ SOFTWARE.
  *
  */
 
-int
+int _X_COLD
 SProcXGetDeviceControl(ClientPtr client)
 {
     REQUEST(xGetDeviceControlReq);
@@ -153,7 +153,7 @@ CopySwapDeviceEnable(ClientPtr client, DeviceIntPtr dev, char *buf)
  *
  */
 
-void
+void _X_COLD
 SRepXGetDeviceControl(ClientPtr client, int size, xGetDeviceControlReply * rep)
 {
     swaps(&rep->sequenceNumber);
diff --git a/Xi/getfctl.c b/Xi/getfctl.c
index 599b2ef..eea0113 100644
--- a/Xi/getfctl.c
+++ b/Xi/getfctl.c
@@ -68,7 +68,7 @@ SOFTWARE.
  *
  */
 
-int
+int _X_COLD
 SProcXGetFeedbackControl(ClientPtr client)
 {
     REQUEST(xGetFeedbackControlReq);
@@ -258,7 +258,7 @@ CopySwapBellFeedback(ClientPtr client, BellFeedbackPtr b, char **buf)
  *
  */
 
-void
+void _X_COLD
 SRepXGetFeedbackControl(ClientPtr client, int size,
                         xGetFeedbackControlReply * rep)
 {
diff --git a/Xi/getfocus.c b/Xi/getfocus.c
index 40546cb..cf8e024 100644
--- a/Xi/getfocus.c
+++ b/Xi/getfocus.c
@@ -68,7 +68,7 @@ SOFTWARE.
  *
  */
 
-int
+int _X_COLD
 SProcXGetDeviceFocus(ClientPtr client)
 {
     REQUEST(xGetDeviceFocusReq);
@@ -130,7 +130,7 @@ ProcXGetDeviceFocus(ClientPtr client)
  *
  */
 
-void
+void _X_COLD
 SRepXGetDeviceFocus(ClientPtr client, int size, xGetDeviceFocusReply * rep)
 {
     swaps(&rep->sequenceNumber);
diff --git a/Xi/getkmap.c b/Xi/getkmap.c
index 87c1977..c6db2ce 100644
--- a/Xi/getkmap.c
+++ b/Xi/getkmap.c
@@ -71,7 +71,7 @@ SOFTWARE.
  *
  */
 
-int
+int _X_COLD
 SProcXGetDeviceKeyMapping(ClientPtr client)
 {
     REQUEST(xGetDeviceKeyMappingReq);
@@ -146,7 +146,7 @@ ProcXGetDeviceKeyMapping(ClientPtr client)
  *
  */
 
-void
+void _X_COLD
 SRepXGetDeviceKeyMapping(ClientPtr client, int size,
                          xGetDeviceKeyMappingReply * rep)
 {
diff --git a/Xi/getmmap.c b/Xi/getmmap.c
index f07f2bb..19d8eb2 100644
--- a/Xi/getmmap.c
+++ b/Xi/getmmap.c
@@ -68,7 +68,7 @@ SOFTWARE.
  *
  */
 
-int
+int _X_COLD
 SProcXGetDeviceModifierMapping(ClientPtr client)
 {
     REQUEST(xGetDeviceModifierMappingReq);
@@ -125,7 +125,7 @@ ProcXGetDeviceModifierMapping(ClientPtr client)
  *
  */
 
-void
+void _X_COLD
 SRepXGetDeviceModifierMapping(ClientPtr client, int size,
                               xGetDeviceModifierMappingReply * rep)
 {
diff --git a/Xi/getprop.c b/Xi/getprop.c
index 19f18af..b744f35 100644
--- a/Xi/getprop.c
+++ b/Xi/getprop.c
@@ -72,7 +72,7 @@ extern int ExtEventIndex;
  *
  */
 
-int
+int _X_COLD
 SProcXGetDeviceDontPropagateList(ClientPtr client)
 {
     REQUEST(xGetDeviceDontPropagateListReq);
@@ -173,7 +173,7 @@ XEventClass
  *
  */
 
-void
+void _X_COLD
 SRepXGetDeviceDontPropagateList(ClientPtr client, int size,
                                 xGetDeviceDontPropagateListReply * rep)
 {
diff --git a/Xi/getselev.c b/Xi/getselev.c
index 60a46c2..0623c7a 100644
--- a/Xi/getselev.c
+++ b/Xi/getselev.c
@@ -70,7 +70,7 @@ SOFTWARE.
  *
  */
 
-int
+int _X_COLD
 SProcXGetSelectedExtensionEvents(ClientPtr client)
 {
     REQUEST(xGetSelectedExtensionEventsReq);
@@ -164,7 +164,7 @@ ProcXGetSelectedExtensionEvents(ClientPtr client)
  *
  */
 
-void
+void _X_COLD
 SRepXGetSelectedExtensionEvents(ClientPtr client, int size,
                                 xGetSelectedExtensionEventsReply * rep)
 {
diff --git a/Xi/getvers.c b/Xi/getvers.c
index 829e695..a56ff16 100644
--- a/Xi/getvers.c
+++ b/Xi/getvers.c
@@ -70,7 +70,7 @@ XExtensionVersion XIVersion;
  *
  */
 
-int
+int _X_COLD
 SProcXGetExtensionVersion(ClientPtr client)
 {
     REQUEST(xGetExtensionVersionReq);
@@ -120,7 +120,7 @@ ProcXGetExtensionVersion(ClientPtr client)
  *
  */
 
-void
+void _X_COLD
 SRepXGetExtensionVersion(ClientPtr client, int size,
                          xGetExtensionVersionReply * rep)
 {
diff --git a/Xi/grabdev.c b/Xi/grabdev.c
index 0900438..eb4f9bf 100644
--- a/Xi/grabdev.c
+++ b/Xi/grabdev.c
@@ -72,7 +72,7 @@ extern int ExtEventIndex;
  *
  */
 
-int
+int _X_COLD
 SProcXGrabDevice(ClientPtr client)
 {
     REQUEST(xGrabDeviceReq);
@@ -205,7 +205,7 @@ CreateMaskFromList(ClientPtr client, XEventClass * list, int count,
  *
  */
 
-void
+void _X_COLD
 SRepXGrabDevice(ClientPtr client, int size, xGrabDeviceReply * rep)
 {
     swaps(&rep->sequenceNumber);
diff --git a/Xi/grabdevb.c b/Xi/grabdevb.c
index 8b4ae69..a2f7eb3 100644
--- a/Xi/grabdevb.c
+++ b/Xi/grabdevb.c
@@ -71,7 +71,7 @@ SOFTWARE.
  *
  */
 
-int
+int _X_COLD
 SProcXGrabDeviceButton(ClientPtr client)
 {
     REQUEST(xGrabDeviceButtonReq);
diff --git a/Xi/grabdevk.c b/Xi/grabdevk.c
index 8694f9e..e856fa8 100644
--- a/Xi/grabdevk.c
+++ b/Xi/grabdevk.c
@@ -71,7 +71,7 @@ SOFTWARE.
  *
  */
 
-int
+int _X_COLD
 SProcXGrabDeviceKey(ClientPtr client)
 {
     REQUEST(xGrabDeviceKeyReq);
diff --git a/Xi/gtmotion.c b/Xi/gtmotion.c
index cde5351..7c66849 100644
--- a/Xi/gtmotion.c
+++ b/Xi/gtmotion.c
@@ -68,7 +68,7 @@ SOFTWARE.
  *
  */
 
-int
+int _X_COLD
 SProcXGetDeviceMotionEvents(ClientPtr client)
 {
     REQUEST(xGetDeviceMotionEventsReq);
@@ -162,7 +162,7 @@ ProcXGetDeviceMotionEvents(ClientPtr client)
  *
  */
 
-void
+void _X_COLD
 SRepXGetDeviceMotionEvents(ClientPtr client, int size,
                            xGetDeviceMotionEventsReply * rep)
 {
diff --git a/Xi/listdev.c b/Xi/listdev.c
index 6a10091..c15e61b 100644
--- a/Xi/listdev.c
+++ b/Xi/listdev.c
@@ -74,7 +74,7 @@ SOFTWARE.
  *
  */
 
-int
+int _X_COLD
 SProcXListInputDevices(ClientPtr client)
 {
     REQUEST(xListInputDevicesReq);
@@ -413,7 +413,7 @@ ProcXListInputDevices(ClientPtr client)
  *
  */
 
-void
+void _X_COLD
 SRepXListInputDevices(ClientPtr client, int size, xListInputDevicesReply * rep)
 {
     swaps(&rep->sequenceNumber);
diff --git a/Xi/opendev.c b/Xi/opendev.c
index 6708bad..3472c97 100644
--- a/Xi/opendev.c
+++ b/Xi/opendev.c
@@ -73,7 +73,7 @@ extern CARD8 event_base[];
  *
  */
 
-int
+int _X_COLD
 SProcXOpenDevice(ClientPtr client)
 {
     REQUEST(xOpenDeviceReq);
@@ -163,7 +163,7 @@ ProcXOpenDevice(ClientPtr client)
  *
  */
 
-void
+void _X_COLD
 SRepXOpenDevice(ClientPtr client, int size, xOpenDeviceReply * rep)
 {
     swaps(&rep->sequenceNumber);
diff --git a/Xi/queryst.c b/Xi/queryst.c
index 04a652b..6c9d666 100644
--- a/Xi/queryst.c
+++ b/Xi/queryst.c
@@ -53,7 +53,7 @@ from The Open Group.
  *
  */
 
-int
+int _X_COLD
 SProcXQueryDeviceState(ClientPtr client)
 {
     REQUEST(xQueryDeviceStateReq);
@@ -179,7 +179,7 @@ ProcXQueryDeviceState(ClientPtr client)
  *
  */
 
-void
+void _X_COLD
 SRepXQueryDeviceState(ClientPtr client, int size, xQueryDeviceStateReply * rep)
 {
     swaps(&rep->sequenceNumber);
diff --git a/Xi/selectev.c b/Xi/selectev.c
index 284bd29..b9b8112 100644
--- a/Xi/selectev.c
+++ b/Xi/selectev.c
@@ -119,7 +119,7 @@ HandleDevicePresenceMask(ClientPtr client, WindowPtr win,
  *
  */
 
-int
+int _X_COLD
 SProcXSelectExtensionEvent(ClientPtr client)
 {
     REQUEST(xSelectExtensionEventReq);
diff --git a/Xi/sendexev.c b/Xi/sendexev.c
index 183f88d..11d8202 100644
--- a/Xi/sendexev.c
+++ b/Xi/sendexev.c
@@ -73,7 +73,7 @@ extern int lastEvent;           /* Defined in extension.c */
  *
  */
 
-int
+int _X_COLD
 SProcXSendExtensionEvent(ClientPtr client)
 {
     CARD32 *p;
diff --git a/Xi/setbmap.c b/Xi/setbmap.c
index 9479655..f94db86 100644
--- a/Xi/setbmap.c
+++ b/Xi/setbmap.c
@@ -68,7 +68,7 @@ SOFTWARE.
  *
  */
 
-int
+int _X_COLD
 SProcXSetDeviceButtonMapping(ClientPtr client)
 {
     REQUEST(xSetDeviceButtonMappingReq);
@@ -130,7 +130,7 @@ ProcXSetDeviceButtonMapping(ClientPtr client)
  *
  */
 
-void
+void _X_COLD
 SRepXSetDeviceButtonMapping(ClientPtr client, int size,
                             xSetDeviceButtonMappingReply * rep)
 {
diff --git a/Xi/setdval.c b/Xi/setdval.c
index 463e4f3..e57cb25 100644
--- a/Xi/setdval.c
+++ b/Xi/setdval.c
@@ -68,7 +68,7 @@ SOFTWARE.
  *
  */
 
-int
+int _X_COLD
 SProcXSetDeviceValuators(ClientPtr client)
 {
     REQUEST(xSetDeviceValuatorsReq);
@@ -137,7 +137,7 @@ ProcXSetDeviceValuators(ClientPtr client)
  *
  */
 
-void
+void _X_COLD
 SRepXSetDeviceValuators(ClientPtr client, int size,
                         xSetDeviceValuatorsReply * rep)
 {
diff --git a/Xi/setfocus.c b/Xi/setfocus.c
index 8091841..8ca19d5 100644
--- a/Xi/setfocus.c
+++ b/Xi/setfocus.c
@@ -71,7 +71,7 @@ SOFTWARE.
  *
  */
 
-int
+int _X_COLD
 SProcXSetDeviceFocus(ClientPtr client)
 {
     REQUEST(xSetDeviceFocusReq);
diff --git a/Xi/setmmap.c b/Xi/setmmap.c
index 1320cfe..d60096a 100644
--- a/Xi/setmmap.c
+++ b/Xi/setmmap.c
@@ -70,7 +70,7 @@ SOFTWARE.
  *
  */
 
-int
+int _X_COLD
 SProcXSetDeviceModifierMapping(ClientPtr client)
 {
     REQUEST(xSetDeviceModifierMappingReq);
@@ -136,7 +136,7 @@ ProcXSetDeviceModifierMapping(ClientPtr client)
  *
  */
 
-void
+void _X_COLD
 SRepXSetDeviceModifierMapping(ClientPtr client, int size,
                               xSetDeviceModifierMappingReply * rep)
 {
diff --git a/Xi/setmode.c b/Xi/setmode.c
index 5ed0913..e7e12d4 100644
--- a/Xi/setmode.c
+++ b/Xi/setmode.c
@@ -68,7 +68,7 @@ SOFTWARE.
  *
  */
 
-int
+int _X_COLD
 SProcXSetDeviceMode(ClientPtr client)
 {
     REQUEST(xSetDeviceModeReq);
@@ -138,7 +138,7 @@ ProcXSetDeviceMode(ClientPtr client)
  *
  */
 
-void
+void _X_COLD
 SRepXSetDeviceMode(ClientPtr client, int size, xSetDeviceModeReply * rep)
 {
     swaps(&rep->sequenceNumber);
diff --git a/Xi/ungrdev.c b/Xi/ungrdev.c
index 162a00a..fd4fc0f 100644
--- a/Xi/ungrdev.c
+++ b/Xi/ungrdev.c
@@ -67,7 +67,7 @@ SOFTWARE.
  *
  */
 
-int
+int _X_COLD
 SProcXUngrabDevice(ClientPtr client)
 {
     REQUEST(xUngrabDeviceReq);
diff --git a/Xi/ungrdevb.c b/Xi/ungrdevb.c
index b02510e..47b97d7 100644
--- a/Xi/ungrdevb.c
+++ b/Xi/ungrdevb.c
@@ -73,7 +73,7 @@ SOFTWARE.
  *
  */
 
-int
+int _X_COLD
 SProcXUngrabDeviceButton(ClientPtr client)
 {
     REQUEST(xUngrabDeviceButtonReq);
diff --git a/Xi/ungrdevk.c b/Xi/ungrdevk.c
index f981171..753b14d 100644
--- a/Xi/ungrdevk.c
+++ b/Xi/ungrdevk.c
@@ -75,7 +75,7 @@ SOFTWARE.
  *
  */
 
-int
+int _X_COLD
 SProcXUngrabDeviceKey(ClientPtr client)
 {
     REQUEST(xUngrabDeviceKeyReq);
diff --git a/Xi/xiallowev.c b/Xi/xiallowev.c
index ca263ef..6764801 100644
--- a/Xi/xiallowev.c
+++ b/Xi/xiallowev.c
@@ -44,7 +44,7 @@
 #include "exevents.h"
 #include "xiallowev.h"
 
-int
+int _X_COLD
 SProcXIAllowEvents(ClientPtr client)
 {
     REQUEST(xXIAllowEventsReq);
diff --git a/Xi/xibarriers.c b/Xi/xibarriers.c
index a8b92cc..af1562e 100644
--- a/Xi/xibarriers.c
+++ b/Xi/xibarriers.c
@@ -823,7 +823,7 @@ XIDestroyPointerBarrier(ClientPtr client,
     return Success;
 }
 
-int
+int _X_COLD
 SProcXIBarrierReleasePointer(ClientPtr client)
 {
     xXIBarrierReleasePointerInfo *info;
diff --git a/Xi/xichangecursor.c b/Xi/xichangecursor.c
index 8e6255b..a9a1ac9 100644
--- a/Xi/xichangecursor.c
+++ b/Xi/xichangecursor.c
@@ -53,7 +53,7 @@
  *
  */
 
-int
+int _X_COLD
 SProcXIChangeCursor(ClientPtr client)
 {
     REQUEST(xXIChangeCursorReq);
diff --git a/Xi/xichangehierarchy.c b/Xi/xichangehierarchy.c
index f2b7785..87f191f 100644
--- a/Xi/xichangehierarchy.c
+++ b/Xi/xichangehierarchy.c
@@ -127,7 +127,7 @@ XISendDeviceHierarchyEvent(int flags[MAXDEVICES])
  *
  */
 
-int
+int _X_COLD
 SProcXIChangeHierarchy(ClientPtr client)
 {
     REQUEST(xXIChangeHierarchyReq);
diff --git a/Xi/xigetclientpointer.c b/Xi/xigetclientpointer.c
index 306dd39..c3d494d 100644
--- a/Xi/xigetclientpointer.c
+++ b/Xi/xigetclientpointer.c
@@ -46,7 +46,7 @@
  * setting.
  */
 
-int
+int _X_COLD
 SProcXIGetClientPointer(ClientPtr client)
 {
     REQUEST(xXIGetClientPointerReq);
@@ -96,7 +96,7 @@ ProcXIGetClientPointer(ClientPtr client)
  *
  */
 
-void
+void _X_COLD
 SRepXIGetClientPointer(ClientPtr client, int size,
                        xXIGetClientPointerReply * rep)
 {
diff --git a/Xi/xigrabdev.c b/Xi/xigrabdev.c
index e2a2ae3..cf3ee7b 100644
--- a/Xi/xigrabdev.c
+++ b/Xi/xigrabdev.c
@@ -43,7 +43,7 @@
 #include "xigrabdev.h"
 #include "inpututils.h"
 
-int
+int _X_COLD
 SProcXIGrabDevice(ClientPtr client)
 {
     REQUEST(xXIGrabDeviceReq);
@@ -132,7 +132,7 @@ ProcXIGrabDevice(ClientPtr client)
     return ret;
 }
 
-int
+int _X_COLD
 SProcXIUngrabDevice(ClientPtr client)
 {
     REQUEST(xXIUngrabDeviceReq);
@@ -171,7 +171,7 @@ ProcXIUngrabDevice(ClientPtr client)
     return Success;
 }
 
-void
+void _X_COLD
 SRepXIGrabDevice(ClientPtr client, int size, xXIGrabDeviceReply * rep)
 {
     swaps(&rep->sequenceNumber);
diff --git a/Xi/xipassivegrab.c b/Xi/xipassivegrab.c
index 9241ffd..aa965e4 100644
--- a/Xi/xipassivegrab.c
+++ b/Xi/xipassivegrab.c
@@ -46,7 +46,7 @@
 #include "misc.h"
 #include "inpututils.h"
 
-int
+int _X_COLD
 SProcXIPassiveGrabDevice(ClientPtr client)
 {
     int i;
@@ -238,7 +238,7 @@ ProcXIPassiveGrabDevice(ClientPtr client)
     return ret;
 }
 
-void
+void _X_COLD
 SRepXIPassiveGrabDevice(ClientPtr client, int size,
                         xXIPassiveGrabDeviceReply * rep)
 {
@@ -249,7 +249,7 @@ SRepXIPassiveGrabDevice(ClientPtr client, int size,
     WriteToClient(client, size, rep);
 }
 
-int
+int _X_COLD
 SProcXIPassiveUngrabDevice(ClientPtr client)
 {
     int i;
diff --git a/Xi/xiproperty.c b/Xi/xiproperty.c
index b7a1f59..9acb2eb 100644
--- a/Xi/xiproperty.c
+++ b/Xi/xiproperty.c
@@ -1013,7 +1013,7 @@ ProcXGetDeviceProperty(ClientPtr client)
     return Success;
 }
 
-int
+int _X_COLD
 SProcXListDeviceProperties(ClientPtr client)
 {
     REQUEST(xListDevicePropertiesReq);
@@ -1023,7 +1023,7 @@ SProcXListDeviceProperties(ClientPtr client)
     return (ProcXListDeviceProperties(client));
 }
 
-int
+int _X_COLD
 SProcXChangeDeviceProperty(ClientPtr client)
 {
     REQUEST(xChangeDevicePropertyReq);
@@ -1036,7 +1036,7 @@ SProcXChangeDeviceProperty(ClientPtr client)
     return (ProcXChangeDeviceProperty(client));
 }
 
-int
+int _X_COLD
 SProcXDeleteDeviceProperty(ClientPtr client)
 {
     REQUEST(xDeleteDevicePropertyReq);
@@ -1047,7 +1047,7 @@ SProcXDeleteDeviceProperty(ClientPtr client)
     return (ProcXDeleteDeviceProperty(client));
 }
 
-int
+int _X_COLD
 SProcXGetDeviceProperty(ClientPtr client)
 {
     REQUEST(xGetDevicePropertyReq);
@@ -1063,7 +1063,7 @@ SProcXGetDeviceProperty(ClientPtr client)
 
 /* Reply swapping */
 
-void
+void _X_COLD
 SRepXListDeviceProperties(ClientPtr client, int size,
                           xListDevicePropertiesReply * rep)
 {
@@ -1074,7 +1074,7 @@ SRepXListDeviceProperties(ClientPtr client, int size,
     WriteToClient(client, size, rep);
 }
 
-void
+void _X_COLD
 SRepXGetDeviceProperty(ClientPtr client, int size,
                        xGetDevicePropertyReply * rep)
 {
@@ -1252,7 +1252,7 @@ ProcXIGetProperty(ClientPtr client)
     return Success;
 }
 
-int
+int _X_COLD
 SProcXIListProperties(ClientPtr client)
 {
     REQUEST(xXIListPropertiesReq);
@@ -1263,7 +1263,7 @@ SProcXIListProperties(ClientPtr client)
     return (ProcXIListProperties(client));
 }
 
-int
+int _X_COLD
 SProcXIChangeProperty(ClientPtr client)
 {
     REQUEST(xXIChangePropertyReq);
@@ -1277,7 +1277,7 @@ SProcXIChangeProperty(ClientPtr client)
     return (ProcXIChangeProperty(client));
 }
 
-int
+int _X_COLD
 SProcXIDeleteProperty(ClientPtr client)
 {
     REQUEST(xXIDeletePropertyReq);
@@ -1289,7 +1289,7 @@ SProcXIDeleteProperty(ClientPtr client)
     return (ProcXIDeleteProperty(client));
 }
 
-int
+int _X_COLD
 SProcXIGetProperty(ClientPtr client)
 {
     REQUEST(xXIGetPropertyReq);
@@ -1304,7 +1304,7 @@ SProcXIGetProperty(ClientPtr client)
     return (ProcXIGetProperty(client));
 }
 
-void
+void _X_COLD
 SRepXIListProperties(ClientPtr client, int size, xXIListPropertiesReply * rep)
 {
     swaps(&rep->sequenceNumber);
@@ -1314,7 +1314,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);
diff --git a/Xi/xiquerydevice.c b/Xi/xiquerydevice.c
index 67a9a4f..c0000f9 100644
--- a/Xi/xiquerydevice.c
+++ b/Xi/xiquerydevice.c
@@ -50,7 +50,7 @@ static int
  ListDeviceInfo(ClientPtr client, DeviceIntPtr dev, xXIDeviceInfo * info);
 static int SizeDeviceInfo(DeviceIntPtr dev);
 static void SwapDeviceInfo(DeviceIntPtr dev, xXIDeviceInfo * info);
-int
+int _X_COLD
 SProcXIQueryDevice(ClientPtr client)
 {
     REQUEST(xXIQueryDeviceReq);
diff --git a/Xi/xiquerypointer.c b/Xi/xiquerypointer.c
index c5b0ba7..5b77b1a 100644
--- a/Xi/xiquerypointer.c
+++ b/Xi/xiquerypointer.c
@@ -59,7 +59,7 @@
  *
  */
 
-int
+int _X_COLD
 SProcXIQueryPointer(ClientPtr client)
 {
     REQUEST(xXIQueryPointerReq);
diff --git a/Xi/xiqueryversion.c b/Xi/xiqueryversion.c
index c705f78..111f1d6 100644
--- a/Xi/xiqueryversion.c
+++ b/Xi/xiqueryversion.c
@@ -130,7 +130,7 @@ ProcXIQueryVersion(ClientPtr client)
 
 /* Swapping routines */
 
-int
+int _X_COLD
 SProcXIQueryVersion(ClientPtr client)
 {
     REQUEST(xXIQueryVersionReq);
@@ -141,7 +141,7 @@ SProcXIQueryVersion(ClientPtr client)
     return (ProcXIQueryVersion(client));
 }
 
-void
+void _X_COLD
 SRepXIQueryVersion(ClientPtr client, int size, xXIQueryVersionReply * rep)
 {
     swaps(&rep->sequenceNumber);
diff --git a/Xi/xiselectev.c b/Xi/xiselectev.c
index 168579f..0498e01 100644
--- a/Xi/xiselectev.c
+++ b/Xi/xiselectev.c
@@ -110,7 +110,7 @@ XICheckInvalidMaskBits(ClientPtr client, unsigned char *mask, int len)
     return Success;
 }
 
-int
+int _X_COLD
 SProcXISelectEvents(ClientPtr client)
 {
     int i;
@@ -275,7 +275,7 @@ ProcXISelectEvents(ClientPtr client)
     return Success;
 }
 
-int
+int _X_COLD
 SProcXIGetSelectedEvents(ClientPtr client)
 {
     REQUEST(xXIGetSelectedEventsReq);
diff --git a/Xi/xisetclientpointer.c b/Xi/xisetclientpointer.c
index 24d4a53..e02eac4 100644
--- a/Xi/xisetclientpointer.c
+++ b/Xi/xisetclientpointer.c
@@ -47,7 +47,7 @@
 
 #include "xisetclientpointer.h"
 
-int
+int _X_COLD
 SProcXISetClientPointer(ClientPtr client)
 {
     REQUEST(xXISetClientPointerReq);
diff --git a/Xi/xisetdevfocus.c b/Xi/xisetdevfocus.c
index 96a9a16..2ed445c 100644
--- a/Xi/xisetdevfocus.c
+++ b/Xi/xisetdevfocus.c
@@ -40,7 +40,7 @@
 #include "exglobals.h"          /* BadDevice */
 #include "xisetdevfocus.h"
 
-int
+int _X_COLD
 SProcXISetFocus(ClientPtr client)
 {
     REQUEST(xXISetFocusReq);
@@ -54,7 +54,7 @@ SProcXISetFocus(ClientPtr client)
     return ProcXISetFocus(client);
 }
 
-int
+int _X_COLD
 SProcXIGetFocus(ClientPtr client)
 {
     REQUEST(xXIGetFocusReq);
diff --git a/Xi/xiwarppointer.c b/Xi/xiwarppointer.c
index 780758a..9c2aa33 100644
--- a/Xi/xiwarppointer.c
+++ b/Xi/xiwarppointer.c
@@ -52,7 +52,7 @@
  *
  */
 
-int
+int _X_COLD
 SProcXIWarpPointer(ClientPtr client)
 {
     REQUEST(xXIWarpPointerReq);
diff --git a/composite/compext.c b/composite/compext.c
index 5b17dae..34a2a53 100644
--- a/composite/compext.c
+++ b/composite/compext.c
@@ -375,7 +375,7 @@ ProcCompositeDispatch(ClientPtr client)
         return BadRequest;
 }
 
-static int
+static int _X_COLD
 SProcCompositeQueryVersion(ClientPtr client)
 {
     REQUEST(xCompositeQueryVersionReq);
@@ -387,7 +387,7 @@ SProcCompositeQueryVersion(ClientPtr client)
     return (*ProcCompositeVector[stuff->compositeReqType]) (client);
 }
 
-static int
+static int _X_COLD
 SProcCompositeRedirectWindow(ClientPtr client)
 {
     REQUEST(xCompositeRedirectWindowReq);
@@ -398,7 +398,7 @@ SProcCompositeRedirectWindow(ClientPtr client)
     return (*ProcCompositeVector[stuff->compositeReqType]) (client);
 }
 
-static int
+static int _X_COLD
 SProcCompositeRedirectSubwindows(ClientPtr client)
 {
     REQUEST(xCompositeRedirectSubwindowsReq);
@@ -409,7 +409,7 @@ SProcCompositeRedirectSubwindows(ClientPtr client)
     return (*ProcCompositeVector[stuff->compositeReqType]) (client);
 }
 
-static int
+static int _X_COLD
 SProcCompositeUnredirectWindow(ClientPtr client)
 {
     REQUEST(xCompositeUnredirectWindowReq);
@@ -420,7 +420,7 @@ SProcCompositeUnredirectWindow(ClientPtr client)
     return (*ProcCompositeVector[stuff->compositeReqType]) (client);
 }
 
-static int
+static int _X_COLD
 SProcCompositeUnredirectSubwindows(ClientPtr client)
 {
     REQUEST(xCompositeUnredirectSubwindowsReq);
@@ -431,7 +431,7 @@ SProcCompositeUnredirectSubwindows(ClientPtr client)
     return (*ProcCompositeVector[stuff->compositeReqType]) (client);
 }
 
-static int
+static int _X_COLD
 SProcCompositeCreateRegionFromBorderClip(ClientPtr client)
 {
     REQUEST(xCompositeCreateRegionFromBorderClipReq);
@@ -443,7 +443,7 @@ SProcCompositeCreateRegionFromBorderClip(ClientPtr client)
     return (*ProcCompositeVector[stuff->compositeReqType]) (client);
 }
 
-static int
+static int _X_COLD
 SProcCompositeNameWindowPixmap(ClientPtr client)
 {
     REQUEST(xCompositeNameWindowPixmapReq);
@@ -455,7 +455,7 @@ SProcCompositeNameWindowPixmap(ClientPtr client)
     return (*ProcCompositeVector[stuff->compositeReqType]) (client);
 }
 
-static int
+static int _X_COLD
 SProcCompositeGetOverlayWindow(ClientPtr client)
 {
     REQUEST(xCompositeGetOverlayWindowReq);
@@ -466,7 +466,7 @@ SProcCompositeGetOverlayWindow(ClientPtr client)
     return (*ProcCompositeVector[stuff->compositeReqType]) (client);
 }
 
-static int
+static int _X_COLD
 SProcCompositeReleaseOverlayWindow(ClientPtr client)
 {
     REQUEST(xCompositeReleaseOverlayWindowReq);
@@ -477,17 +477,20 @@ SProcCompositeReleaseOverlayWindow(ClientPtr client)
     return (*ProcCompositeVector[stuff->compositeReqType]) (client);
 }
 
-static int (*SProcCompositeVector[CompositeNumberRequests]) (ClientPtr) = {
-SProcCompositeQueryVersion,
-        SProcCompositeRedirectWindow,
-        SProcCompositeRedirectSubwindows,
-        SProcCompositeUnredirectWindow,
-        SProcCompositeUnredirectSubwindows,
-        SProcCompositeCreateRegionFromBorderClip,
-        SProcCompositeNameWindowPixmap,
-        SProcCompositeGetOverlayWindow, SProcCompositeReleaseOverlayWindow,};
-
 static int
+(*SProcCompositeVector[CompositeNumberRequests]) (ClientPtr) = {
+    SProcCompositeQueryVersion,
+    SProcCompositeRedirectWindow,
+    SProcCompositeRedirectSubwindows,
+    SProcCompositeUnredirectWindow,
+    SProcCompositeUnredirectSubwindows,
+    SProcCompositeCreateRegionFromBorderClip,
+    SProcCompositeNameWindowPixmap,
+    SProcCompositeGetOverlayWindow,
+    SProcCompositeReleaseOverlayWindow,
+};
+
+static int _X_COLD
 SProcCompositeDispatch(ClientPtr client)
 {
     REQUEST(xReq);
diff --git a/damageext/damageext.c b/damageext/damageext.c
index 86b54ee..b186d2c 100644
--- a/damageext/damageext.c
+++ b/damageext/damageext.c
@@ -489,7 +489,7 @@ ProcDamageDispatch(ClientPtr client)
     return (*ProcDamageVector[stuff->damageReqType]) (client);
 }
 
-static int
+static int _X_COLD
 SProcDamageQueryVersion(ClientPtr client)
 {
     REQUEST(xDamageQueryVersionReq);
@@ -501,7 +501,7 @@ SProcDamageQueryVersion(ClientPtr client)
     return (*ProcDamageVector[stuff->damageReqType]) (client);
 }
 
-static int
+static int _X_COLD
 SProcDamageCreate(ClientPtr client)
 {
     REQUEST(xDamageCreateReq);
@@ -513,7 +513,7 @@ SProcDamageCreate(ClientPtr client)
     return (*ProcDamageVector[stuff->damageReqType]) (client);
 }
 
-static int
+static int _X_COLD
 SProcDamageDestroy(ClientPtr client)
 {
     REQUEST(xDamageDestroyReq);
@@ -524,7 +524,7 @@ SProcDamageDestroy(ClientPtr client)
     return (*ProcDamageVector[stuff->damageReqType]) (client);
 }
 
-static int
+static int _X_COLD
 SProcDamageSubtract(ClientPtr client)
 {
     REQUEST(xDamageSubtractReq);
@@ -537,7 +537,7 @@ SProcDamageSubtract(ClientPtr client)
     return (*ProcDamageVector[stuff->damageReqType]) (client);
 }
 
-static int
+static int _X_COLD
 SProcDamageAdd(ClientPtr client)
 {
     REQUEST(xDamageAddReq);
@@ -559,7 +559,7 @@ static int (*SProcDamageVector[XDamageNumberRequests]) (ClientPtr) = {
     SProcDamageAdd,
 };
 
-static int
+static int _X_COLD
 SProcDamageDispatch(ClientPtr client)
 {
     REQUEST(xDamageReq);
@@ -584,7 +584,7 @@ FreeDamageExt(void *value, XID did)
     return Success;
 }
 
-static void
+static void _X_COLD
 SDamageNotifyEvent(xDamageNotifyEvent * from, xDamageNotifyEvent * to)
 {
     to->type = from->type;
diff --git a/dbe/dbe.c b/dbe/dbe.c
index 23f7e16..9a0c7a7 100644
--- a/dbe/dbe.c
+++ b/dbe/dbe.c
@@ -811,7 +811,7 @@ ProcDbeDispatch(ClientPtr client)
  *
  *****************************************************************************/
 
-static int
+static int _X_COLD
 SProcDbeGetVersion(ClientPtr client)
 {
     REQUEST(xDbeGetVersionReq);
@@ -844,7 +844,7 @@ SProcDbeGetVersion(ClientPtr client)
  *
  *****************************************************************************/
 
-static int
+static int _X_COLD
 SProcDbeAllocateBackBufferName(ClientPtr client)
 {
     REQUEST(xDbeAllocateBackBufferNameReq);
@@ -877,7 +877,7 @@ SProcDbeAllocateBackBufferName(ClientPtr client)
  *
  *****************************************************************************/
 
-static int
+static int _X_COLD
 SProcDbeDeallocateBackBufferName(ClientPtr client)
 {
     REQUEST(xDbeDeallocateBackBufferNameReq);
@@ -912,7 +912,7 @@ SProcDbeDeallocateBackBufferName(ClientPtr client)
  *
  *****************************************************************************/
 
-static int
+static int _X_COLD
 SProcDbeSwapBuffers(ClientPtr client)
 {
     REQUEST(xDbeSwapBuffersReq);
@@ -960,7 +960,7 @@ SProcDbeSwapBuffers(ClientPtr client)
  *
  *****************************************************************************/
 
-static int
+static int _X_COLD
 SProcDbeGetVisualInfo(ClientPtr client)
 {
     REQUEST(xDbeGetVisualInfoReq);
@@ -991,7 +991,7 @@ SProcDbeGetVisualInfo(ClientPtr client)
  *
  *****************************************************************************/
 
-static int
+static int _X_COLD
 SProcDbeGetBackBufferAttributes(ClientPtr client)
 {
     REQUEST(xDbeGetBackBufferAttributesReq);
@@ -1015,7 +1015,7 @@ SProcDbeGetBackBufferAttributes(ClientPtr client)
  *
  *****************************************************************************/
 
-static int
+static int _X_COLD
 SProcDbeDispatch(ClientPtr client)
 {
     REQUEST(xReq);
diff --git a/dix/swaprep.c b/dix/swaprep.c
index 905fef7..08344d7 100644
--- a/dix/swaprep.c
+++ b/dix/swaprep.c
@@ -68,7 +68,7 @@ static void SwapFont(xQueryFontReply * pr, Bool hasGlyphs);
  *
  *  \param size size in bytes
  */
-void
+void _X_COLD
 Swap32Write(ClientPtr pClient, int size, CARD32 *pbuf)
 {
     int i;
@@ -87,7 +87,7 @@ Swap32Write(ClientPtr pClient, int size, CARD32 *pbuf)
  *
  * \param size size in bytes
  */
-void
+void _X_COLD
 CopySwap32Write(ClientPtr pClient, int size, CARD32 *pbuf)
 {
     int bufsize = size;
@@ -134,7 +134,7 @@ CopySwap32Write(ClientPtr pClient, int size, CARD32 *pbuf)
  *
  * \param size size in bytes
  */
-void
+void _X_COLD
 CopySwap16Write(ClientPtr pClient, int size, short *pbuf)
 {
     int bufsize = size;
@@ -178,7 +178,7 @@ CopySwap16Write(ClientPtr pClient, int size, short *pbuf)
 }
 
 /* Extra-small reply */
-void
+void _X_COLD
 SGenericReply(ClientPtr pClient, int size, xGenericReply * pRep)
 {
     swaps(&pRep->sequenceNumber);
@@ -186,7 +186,7 @@ SGenericReply(ClientPtr pClient, int size, xGenericReply * pRep)
 }
 
 /* Extra-large reply */
-void
+void _X_COLD
 SGetWindowAttributesReply(ClientPtr pClient, int size,
                           xGetWindowAttributesReply * pRep)
 {
@@ -203,7 +203,7 @@ SGetWindowAttributesReply(ClientPtr pClient, int size,
     WriteToClient(pClient, size, pRep);
 }
 
-void
+void _X_COLD
 SGetGeometryReply(ClientPtr pClient, int size, xGetGeometryReply * pRep)
 {
     swaps(&pRep->sequenceNumber);
@@ -216,7 +216,7 @@ SGetGeometryReply(ClientPtr pClient, int size, xGetGeometryReply * pRep)
     WriteToClient(pClient, size, pRep);
 }
 
-void
+void _X_COLD
 SQueryTreeReply(ClientPtr pClient, int size, xQueryTreeReply * pRep)
 {
     swaps(&pRep->sequenceNumber);
@@ -227,7 +227,7 @@ SQueryTreeReply(ClientPtr pClient, int size, xQueryTreeReply * pRep)
     WriteToClient(pClient, size, pRep);
 }
 
-void
+void _X_COLD
 SInternAtomReply(ClientPtr pClient, int size, xInternAtomReply * pRep)
 {
     swaps(&pRep->sequenceNumber);
@@ -235,7 +235,7 @@ SInternAtomReply(ClientPtr pClient, int size, xInternAtomReply * pRep)
     WriteToClient(pClient, size, pRep);
 }
 
-void
+void _X_COLD
 SGetAtomNameReply(ClientPtr pClient, int size, xGetAtomNameReply * pRep)
 {
     swaps(&pRep->sequenceNumber);
@@ -244,7 +244,7 @@ SGetAtomNameReply(ClientPtr pClient, int size, xGetAtomNameReply * pRep)
     WriteToClient(pClient, size, pRep);
 }
 
-void
+void _X_COLD
 SGetPropertyReply(ClientPtr pClient, int size, xGetPropertyReply * pRep)
 {
     swaps(&pRep->sequenceNumber);
@@ -255,7 +255,7 @@ SGetPropertyReply(ClientPtr pClient, int size, xGetPropertyReply * pRep)
     WriteToClient(pClient, size, pRep);
 }
 
-void
+void _X_COLD
 SListPropertiesReply(ClientPtr pClient, int size, xListPropertiesReply * pRep)
 {
     swaps(&pRep->sequenceNumber);
@@ -264,7 +264,7 @@ SListPropertiesReply(ClientPtr pClient, int size, xListPropertiesReply * pRep)
     WriteToClient(pClient, size, pRep);
 }
 
-void
+void _X_COLD
 SGetSelectionOwnerReply(ClientPtr pClient, int size,
                         xGetSelectionOwnerReply * pRep)
 {
@@ -273,7 +273,7 @@ SGetSelectionOwnerReply(ClientPtr pClient, int size,
     WriteToClient(pClient, size, pRep);
 }
 
-void
+void _X_COLD
 SQueryPointerReply(ClientPtr pClient, int size, xQueryPointerReply * pRep)
 {
     swaps(&pRep->sequenceNumber);
@@ -287,7 +287,7 @@ SQueryPointerReply(ClientPtr pClient, int size, xQueryPointerReply * pRep)
     WriteToClient(pClient, size, pRep);
 }
 
-static void
+static void _X_COLD
 SwapTimecoord(xTimecoord * pCoord)
 {
     swapl(&pCoord->time);
@@ -295,7 +295,7 @@ SwapTimecoord(xTimecoord * pCoord)
     swaps(&pCoord->y);
 }
 
-void
+void _X_COLD
 SwapTimeCoordWrite(ClientPtr pClient, int size, xTimecoord * pRep)
 {
     int i, n;
@@ -311,7 +311,7 @@ SwapTimeCoordWrite(ClientPtr pClient, int size, xTimecoord * pRep)
 
 }
 
-void
+void _X_COLD
 SGetMotionEventsReply(ClientPtr pClient, int size, xGetMotionEventsReply * pRep)
 {
     swaps(&pRep->sequenceNumber);
@@ -320,7 +320,7 @@ SGetMotionEventsReply(ClientPtr pClient, int size, xGetMotionEventsReply * pRep)
     WriteToClient(pClient, size, pRep);
 }
 
-void
+void _X_COLD
 STranslateCoordsReply(ClientPtr pClient, int size, xTranslateCoordsReply * pRep)
 {
     swaps(&pRep->sequenceNumber);
@@ -330,7 +330,7 @@ STranslateCoordsReply(ClientPtr pClient, int size, xTranslateCoordsReply * pRep)
     WriteToClient(pClient, size, pRep);
 }
 
-void
+void _X_COLD
 SGetInputFocusReply(ClientPtr pClient, int size, xGetInputFocusReply * pRep)
 {
     swaps(&pRep->sequenceNumber);
@@ -339,7 +339,7 @@ SGetInputFocusReply(ClientPtr pClient, int size, xGetInputFocusReply * pRep)
 }
 
 /* extra long reply */
-void
+void _X_COLD
 SQueryKeymapReply(ClientPtr pClient, int size, xQueryKeymapReply * pRep)
 {
     swaps(&pRep->sequenceNumber);
@@ -347,7 +347,7 @@ SQueryKeymapReply(ClientPtr pClient, int size, xQueryKeymapReply * pRep)
     WriteToClient(pClient, size, pRep);
 }
 
-static void
+static void _X_COLD
 SwapCharInfo(xCharInfo * pInfo)
 {
     swaps(&pInfo->leftSideBearing);
@@ -358,7 +358,7 @@ SwapCharInfo(xCharInfo * pInfo)
     swaps(&pInfo->attributes);
 }
 
-static void
+static void _X_COLD
 SwapFontInfo(xQueryFontReply * pr)
 {
     swaps(&pr->minCharOrByte2);
@@ -372,7 +372,7 @@ SwapFontInfo(xQueryFontReply * pr)
     swapl(&pr->nCharInfos);
 }
 
-static void
+static void _X_COLD
 SwapFont(xQueryFontReply * pr, Bool hasGlyphs)
 {
     unsigned i;
@@ -401,14 +401,14 @@ SwapFont(xQueryFontReply * pr, Bool hasGlyphs)
     }
 }
 
-void
+void _X_COLD
 SQueryFontReply(ClientPtr pClient, int size, xQueryFontReply * pRep)
 {
     SwapFont(pRep, TRUE);
     WriteToClient(pClient, size, pRep);
 }
 
-void
+void _X_COLD
 SQueryTextExtentsReply(ClientPtr pClient, int size,
                        xQueryTextExtentsReply * pRep)
 {
@@ -423,7 +423,7 @@ SQueryTextExtentsReply(ClientPtr pClient, int size,
     WriteToClient(pClient, size, pRep);
 }
 
-void
+void _X_COLD
 SListFontsReply(ClientPtr pClient, int size, xListFontsReply * pRep)
 {
     swaps(&pRep->sequenceNumber);
@@ -432,7 +432,7 @@ SListFontsReply(ClientPtr pClient, int size, xListFontsReply * pRep)
     WriteToClient(pClient, size, pRep);
 }
 
-void
+void _X_COLD
 SListFontsWithInfoReply(ClientPtr pClient, int size,
                         xListFontsWithInfoReply * pRep)
 {
@@ -440,7 +440,7 @@ SListFontsWithInfoReply(ClientPtr pClient, int size,
     WriteToClient(pClient, size, pRep);
 }
 
-void
+void _X_COLD
 SGetFontPathReply(ClientPtr pClient, int size, xGetFontPathReply * pRep)
 {
     swaps(&pRep->sequenceNumber);
@@ -449,7 +449,7 @@ SGetFontPathReply(ClientPtr pClient, int size, xGetFontPathReply * pRep)
     WriteToClient(pClient, size, pRep);
 }
 
-void
+void _X_COLD
 SGetImageReply(ClientPtr pClient, int size, xGetImageReply * pRep)
 {
     swaps(&pRep->sequenceNumber);
@@ -459,7 +459,7 @@ SGetImageReply(ClientPtr pClient, int size, xGetImageReply * pRep)
     /* Fortunately, image doesn't need swapping */
 }
 
-void
+void _X_COLD
 SListInstalledColormapsReply(ClientPtr pClient, int size,
                              xListInstalledColormapsReply * pRep)
 {
@@ -469,7 +469,7 @@ SListInstalledColormapsReply(ClientPtr pClient, int size,
     WriteToClient(pClient, size, pRep);
 }
 
-void
+void _X_COLD
 SAllocColorReply(ClientPtr pClient, int size, xAllocColorReply * pRep)
 {
     swaps(&pRep->sequenceNumber);
@@ -480,7 +480,7 @@ SAllocColorReply(ClientPtr pClient, int size, xAllocColorReply * pRep)
     WriteToClient(pClient, size, pRep);
 }
 
-void
+void _X_COLD
 SAllocNamedColorReply(ClientPtr pClient, int size, xAllocNamedColorReply * pRep)
 {
     swaps(&pRep->sequenceNumber);
@@ -494,7 +494,7 @@ SAllocNamedColorReply(ClientPtr pClient, int size, xAllocNamedColorReply * pRep)
     WriteToClient(pClient, size, pRep);
 }
 
-void
+void _X_COLD
 SAllocColorCellsReply(ClientPtr pClient, int size, xAllocColorCellsReply * pRep)
 {
     swaps(&pRep->sequenceNumber);
@@ -504,7 +504,7 @@ SAllocColorCellsReply(ClientPtr pClient, int size, xAllocColorCellsReply * pRep)
     WriteToClient(pClient, size, pRep);
 }
 
-void
+void _X_COLD
 SAllocColorPlanesReply(ClientPtr pClient, int size,
                        xAllocColorPlanesReply * pRep)
 {
@@ -517,7 +517,7 @@ SAllocColorPlanesReply(ClientPtr pClient, int size,
     WriteToClient(pClient, size, pRep);
 }
 
-static void
+static void _X_COLD
 SwapRGB(xrgb * prgb)
 {
     swaps(&prgb->red);
@@ -525,7 +525,7 @@ SwapRGB(xrgb * prgb)
     swaps(&prgb->blue);
 }
 
-void
+void _X_COLD
 SQColorsExtend(ClientPtr pClient, int size, xrgb * prgb)
 {
     int i, n;
@@ -540,7 +540,7 @@ SQColorsExtend(ClientPtr pClient, int size, xrgb * prgb)
     WriteToClient(pClient, size, prgb);
 }
 
-void
+void _X_COLD
 SQueryColorsReply(ClientPtr pClient, int size, xQueryColorsReply * pRep)
 {
     swaps(&pRep->sequenceNumber);
@@ -549,7 +549,7 @@ SQueryColorsReply(ClientPtr pClient, int size, xQueryColorsReply * pRep)
     WriteToClient(pClient, size, pRep);
 }
 
-void
+void _X_COLD
 SLookupColorReply(ClientPtr pClient, int size, xLookupColorReply * pRep)
 {
     swaps(&pRep->sequenceNumber);
@@ -562,7 +562,7 @@ SLookupColorReply(ClientPtr pClient, int size, xLookupColorReply * pRep)
     WriteToClient(pClient, size, pRep);
 }
 
-void
+void _X_COLD
 SQueryBestSizeReply(ClientPtr pClient, int size, xQueryBestSizeReply * pRep)
 {
     swaps(&pRep->sequenceNumber);
@@ -571,7 +571,7 @@ SQueryBestSizeReply(ClientPtr pClient, int size, xQueryBestSizeReply * pRep)
     WriteToClient(pClient, size, pRep);
 }
 
-void
+void _X_COLD
 SListExtensionsReply(ClientPtr pClient, int size, xListExtensionsReply * pRep)
 {
     swaps(&pRep->sequenceNumber);
@@ -579,7 +579,7 @@ SListExtensionsReply(ClientPtr pClient, int size, xListExtensionsReply * pRep)
     WriteToClient(pClient, size, pRep);
 }
 
-void
+void _X_COLD
 SGetKeyboardMappingReply(ClientPtr pClient, int size,
                          xGetKeyboardMappingReply * pRep)
 {
@@ -588,7 +588,7 @@ SGetKeyboardMappingReply(ClientPtr pClient, int size,
     WriteToClient(pClient, size, pRep);
 }
 
-void
+void _X_COLD
 SGetPointerMappingReply(ClientPtr pClient, int size,
                         xGetPointerMappingReply * pRep)
 {
@@ -597,7 +597,7 @@ SGetPointerMappingReply(ClientPtr pClient, int size,
     WriteToClient(pClient, size, pRep);
 }
 
-void
+void _X_COLD
 SGetModifierMappingReply(ClientPtr pClient, int size,
                          xGetModifierMappingReply * pRep)
 {
@@ -606,7 +606,7 @@ SGetModifierMappingReply(ClientPtr pClient, int size,
     WriteToClient(pClient, size, pRep);
 }
 
-void
+void _X_COLD
 SGetKeyboardControlReply(ClientPtr pClient, int size,
                          xGetKeyboardControlReply * pRep)
 {
@@ -618,7 +618,7 @@ SGetKeyboardControlReply(ClientPtr pClient, int size,
     WriteToClient(pClient, size, pRep);
 }
 
-void
+void _X_COLD
 SGetPointerControlReply(ClientPtr pClient, int size,
                         xGetPointerControlReply * pRep)
 {
@@ -629,7 +629,7 @@ SGetPointerControlReply(ClientPtr pClient, int size,
     WriteToClient(pClient, size, pRep);
 }
 
-void
+void _X_COLD
 SGetScreenSaverReply(ClientPtr pClient, int size, xGetScreenSaverReply * pRep)
 {
     swaps(&pRep->sequenceNumber);
@@ -638,7 +638,7 @@ SGetScreenSaverReply(ClientPtr pClient, int size, xGetScreenSaverReply * pRep)
     WriteToClient(pClient, size, pRep);
 }
 
-void
+void _X_COLD
 SLHostsExtend(ClientPtr pClient, int size, char *buf)
 {
     char *bufT = buf;
@@ -654,7 +654,7 @@ SLHostsExtend(ClientPtr pClient, int size, char *buf)
     WriteToClient(pClient, size, buf);
 }
 
-void
+void _X_COLD
 SListHostsReply(ClientPtr pClient, int size, xListHostsReply * pRep)
 {
     swaps(&pRep->sequenceNumber);
@@ -663,7 +663,7 @@ SListHostsReply(ClientPtr pClient, int size, xListHostsReply * pRep)
     WriteToClient(pClient, size, pRep);
 }
 
-void
+void _X_COLD
 SErrorEvent(xError * from, xError * to)
 {
     to->type = X_Error;
@@ -674,7 +674,7 @@ SErrorEvent(xError * from, xError * to)
     to->majorCode = from->majorCode;
 }
 
-void
+void _X_COLD
 SKeyButtonPtrEvent(xEvent *from, xEvent *to)
 {
     to->u.u.type = from->u.u.type;
@@ -692,7 +692,7 @@ SKeyButtonPtrEvent(xEvent *from, xEvent *to)
     to->u.keyButtonPointer.sameScreen = from->u.keyButtonPointer.sameScreen;
 }
 
-void
+void _X_COLD
 SEnterLeaveEvent(xEvent *from, xEvent *to)
 {
     to->u.u.type = from->u.u.type;
@@ -711,7 +711,7 @@ SEnterLeaveEvent(xEvent *from, xEvent *to)
     to->u.enterLeave.flags = from->u.enterLeave.flags;
 }
 
-void
+void _X_COLD
 SFocusEvent(xEvent *from, xEvent *to)
 {
     to->u.u.type = from->u.u.type;
@@ -721,7 +721,7 @@ SFocusEvent(xEvent *from, xEvent *to)
     to->u.focus.mode = from->u.focus.mode;
 }
 
-void
+void _X_COLD
 SExposeEvent(xEvent *from, xEvent *to)
 {
     to->u.u.type = from->u.u.type;
@@ -734,7 +734,7 @@ SExposeEvent(xEvent *from, xEvent *to)
     cpswaps(from->u.expose.count, to->u.expose.count);
 }
 
-void
+void _X_COLD
 SGraphicsExposureEvent(xEvent *from, xEvent *to)
 {
     to->u.u.type = from->u.u.type;
@@ -750,7 +750,7 @@ SGraphicsExposureEvent(xEvent *from, xEvent *to)
     to->u.graphicsExposure.majorEvent = from->u.graphicsExposure.majorEvent;
 }
 
-void
+void _X_COLD
 SNoExposureEvent(xEvent *from, xEvent *to)
 {
     to->u.u.type = from->u.u.type;
@@ -760,7 +760,7 @@ SNoExposureEvent(xEvent *from, xEvent *to)
     to->u.noExposure.majorEvent = from->u.noExposure.majorEvent;
 }
 
-void
+void _X_COLD
 SVisibilityEvent(xEvent *from, xEvent *to)
 {
     to->u.u.type = from->u.u.type;
@@ -769,7 +769,7 @@ SVisibilityEvent(xEvent *from, xEvent *to)
     to->u.visibility.state = from->u.visibility.state;
 }
 
-void
+void _X_COLD
 SCreateNotifyEvent(xEvent *from, xEvent *to)
 {
     to->u.u.type = from->u.u.type;
@@ -784,7 +784,7 @@ SCreateNotifyEvent(xEvent *from, xEvent *to)
     to->u.createNotify.override = from->u.createNotify.override;
 }
 
-void
+void _X_COLD
 SDestroyNotifyEvent(xEvent *from, xEvent *to)
 {
     to->u.u.type = from->u.u.type;
@@ -793,7 +793,7 @@ SDestroyNotifyEvent(xEvent *from, xEvent *to)
     cpswapl(from->u.destroyNotify.window, to->u.destroyNotify.window);
 }
 
-void
+void _X_COLD
 SUnmapNotifyEvent(xEvent *from, xEvent *to)
 {
     to->u.u.type = from->u.u.type;
@@ -803,7 +803,7 @@ SUnmapNotifyEvent(xEvent *from, xEvent *to)
     to->u.unmapNotify.fromConfigure = from->u.unmapNotify.fromConfigure;
 }
 
-void
+void _X_COLD
 SMapNotifyEvent(xEvent *from, xEvent *to)
 {
     to->u.u.type = from->u.u.type;
@@ -813,7 +813,7 @@ SMapNotifyEvent(xEvent *from, xEvent *to)
     to->u.mapNotify.override = from->u.mapNotify.override;
 }
 
-void
+void _X_COLD
 SMapRequestEvent(xEvent *from, xEvent *to)
 {
     to->u.u.type = from->u.u.type;
@@ -822,7 +822,7 @@ SMapRequestEvent(xEvent *from, xEvent *to)
     cpswapl(from->u.mapRequest.window, to->u.mapRequest.window);
 }
 
-void
+void _X_COLD
 SReparentEvent(xEvent *from, xEvent *to)
 {
     to->u.u.type = from->u.u.type;
@@ -835,7 +835,7 @@ SReparentEvent(xEvent *from, xEvent *to)
     to->u.reparent.override = from->u.reparent.override;
 }
 
-void
+void _X_COLD
 SConfigureNotifyEvent(xEvent *from, xEvent *to)
 {
     to->u.u.type = from->u.u.type;
@@ -853,7 +853,7 @@ SConfigureNotifyEvent(xEvent *from, xEvent *to)
     to->u.configureNotify.override = from->u.configureNotify.override;
 }
 
-void
+void _X_COLD
 SConfigureRequestEvent(xEvent *from, xEvent *to)
 {
     to->u.u.type = from->u.u.type;
@@ -872,7 +872,7 @@ SConfigureRequestEvent(xEvent *from, xEvent *to)
             to->u.configureRequest.valueMask);
 }
 
-void
+void _X_COLD
 SGravityEvent(xEvent *from, xEvent *to)
 {
     to->u.u.type = from->u.u.type;
@@ -883,7 +883,7 @@ SGravityEvent(xEvent *from, xEvent *to)
     cpswaps(from->u.gravity.y, to->u.gravity.y);
 }
 
-void
+void _X_COLD
 SResizeRequestEvent(xEvent *from, xEvent *to)
 {
     to->u.u.type = from->u.u.type;
@@ -893,7 +893,7 @@ SResizeRequestEvent(xEvent *from, xEvent *to)
     cpswaps(from->u.resizeRequest.height, to->u.resizeRequest.height);
 }
 
-void
+void _X_COLD
 SCirculateEvent(xEvent *from, xEvent *to)
 {
     to->u.u.type = from->u.u.type;
@@ -905,7 +905,7 @@ SCirculateEvent(xEvent *from, xEvent *to)
     to->u.circulate.place = from->u.circulate.place;
 }
 
-void
+void _X_COLD
 SPropertyEvent(xEvent *from, xEvent *to)
 {
     to->u.u.type = from->u.u.type;
@@ -916,7 +916,7 @@ SPropertyEvent(xEvent *from, xEvent *to)
     to->u.property.state = from->u.property.state;
 }
 
-void
+void _X_COLD
 SSelectionClearEvent(xEvent *from, xEvent *to)
 {
     to->u.u.type = from->u.u.type;
@@ -926,7 +926,7 @@ SSelectionClearEvent(xEvent *from, xEvent *to)
     cpswapl(from->u.selectionClear.atom, to->u.selectionClear.atom);
 }
 
-void
+void _X_COLD
 SSelectionRequestEvent(xEvent *from, xEvent *to)
 {
     to->u.u.type = from->u.u.type;
@@ -941,7 +941,7 @@ SSelectionRequestEvent(xEvent *from, xEvent *to)
     cpswapl(from->u.selectionRequest.property, to->u.selectionRequest.property);
 }
 
-void
+void _X_COLD
 SSelectionNotifyEvent(xEvent *from, xEvent *to)
 {
     to->u.u.type = from->u.u.type;
@@ -953,7 +953,7 @@ SSelectionNotifyEvent(xEvent *from, xEvent *to)
     cpswapl(from->u.selectionNotify.property, to->u.selectionNotify.property);
 }
 
-void
+void _X_COLD
 SColormapEvent(xEvent *from, xEvent *to)
 {
     to->u.u.type = from->u.u.type;
@@ -964,7 +964,7 @@ SColormapEvent(xEvent *from, xEvent *to)
     to->u.colormap.state = from->u.colormap.state;
 }
 
-void
+void _X_COLD
 SMappingEvent(xEvent *from, xEvent *to)
 {
     to->u.u.type = from->u.u.type;
@@ -974,7 +974,7 @@ SMappingEvent(xEvent *from, xEvent *to)
     to->u.mappingNotify.count = from->u.mappingNotify.count;
 }
 
-void
+void _X_COLD
 SClientMessageEvent(xEvent *from, xEvent *to)
 {
     to->u.u.type = from->u.u.type;
@@ -1024,7 +1024,7 @@ SClientMessageEvent(xEvent *from, xEvent *to)
     }
 }
 
-void
+void _X_COLD
 SKeymapNotifyEvent(xEvent *from, xEvent *to)
 {
     /* Keymap notify events are special; they have no
@@ -1032,7 +1032,7 @@ SKeymapNotifyEvent(xEvent *from, xEvent *to)
     *to = *from;
 }
 
-static void
+static void _X_COLD
 SwapConnSetup(xConnSetup * pConnSetup, xConnSetup * pConnSetupT)
 {
     cpswapl(pConnSetup->release, pConnSetupT->release);
@@ -1051,7 +1051,7 @@ SwapConnSetup(xConnSetup * pConnSetup, xConnSetup * pConnSetupT)
     pConnSetupT->bitmapScanlinePad = pConnSetup->bitmapScanlinePad;
 }
 
-static void
+static void _X_COLD
 SwapWinRoot(xWindowRoot * pRoot, xWindowRoot * pRootT)
 {
     cpswapl(pRoot->windowId, pRootT->windowId);
@@ -1072,7 +1072,7 @@ SwapWinRoot(xWindowRoot * pRoot, xWindowRoot * pRootT)
     pRootT->nDepths = pRoot->nDepths;
 }
 
-static void
+static void _X_COLD
 SwapVisual(xVisualType * pVis, xVisualType * pVisT)
 {
     cpswapl(pVis->visualID, pVisT->visualID);
@@ -1084,7 +1084,7 @@ SwapVisual(xVisualType * pVis, xVisualType * pVisT)
     cpswapl(pVis->blueMask, pVisT->blueMask);
 }
 
-void
+void _X_COLD
 SwapConnSetupInfo(char *pInfo, char *pInfoT)
 {
     int i, j, k;
@@ -1129,7 +1129,7 @@ SwapConnSetupInfo(char *pInfo, char *pInfoT)
     }
 }
 
-void
+void _X_COLD
 WriteSConnectionInfo(ClientPtr pClient, unsigned long size, char *pInfo)
 {
     char *pInfoTBase;
@@ -1144,7 +1144,7 @@ WriteSConnectionInfo(ClientPtr pClient, unsigned long size, char *pInfo)
     free(pInfoTBase);
 }
 
-void
+void _X_COLD
 SwapConnSetupPrefix(xConnSetupPrefix * pcspFrom, xConnSetupPrefix * pcspTo)
 {
     pcspTo->success = pcspFrom->success;
@@ -1154,7 +1154,7 @@ SwapConnSetupPrefix(xConnSetupPrefix * pcspFrom, xConnSetupPrefix * pcspTo)
     cpswaps(pcspFrom->length, pcspTo->length);
 }
 
-void
+void _X_COLD
 WriteSConnSetupPrefix(ClientPtr pClient, xConnSetupPrefix * pcsp)
 {
     xConnSetupPrefix cspT;
@@ -1167,7 +1167,7 @@ WriteSConnSetupPrefix(ClientPtr pClient, xConnSetupPrefix * pcsp)
  * Dummy entry for ReplySwapVector[]
  */
 
-void
+void _X_COLD
 ReplyNotSwappd(ClientPtr pClient, int size, void *pbuf)
 {
     FatalError("Not implemented");
diff --git a/dix/swapreq.c b/dix/swapreq.c
index 61d3ce0..719e9b8 100644
--- a/dix/swapreq.c
+++ b/dix/swapreq.c
@@ -116,7 +116,7 @@ SwapShorts(short *list, unsigned long count)
 
 /* The following is used for all requests that have
    no fields to be swapped (except "length") */
-int
+int _X_COLD
 SProcSimpleReq(ClientPtr client)
 {
     REQUEST(xReq);
@@ -127,7 +127,7 @@ SProcSimpleReq(ClientPtr client)
 /* The following is used for all requests that have
    only a single 32-bit field to be swapped, coming
    right after the "length" field */
-int
+int _X_COLD
 SProcResourceReq(ClientPtr client)
 {
     REQUEST(xResourceReq);
@@ -137,7 +137,7 @@ SProcResourceReq(ClientPtr client)
     return (*ProcVector[stuff->reqType]) (client);
 }
 
-int
+int _X_COLD
 SProcCreateWindow(ClientPtr client)
 {
     REQUEST(xCreateWindowReq);
@@ -157,7 +157,7 @@ SProcCreateWindow(ClientPtr client)
     return ((*ProcVector[X_CreateWindow]) (client));
 }
 
-int
+int _X_COLD
 SProcChangeWindowAttributes(ClientPtr client)
 {
     REQUEST(xChangeWindowAttributesReq);
@@ -169,7 +169,7 @@ SProcChangeWindowAttributes(ClientPtr client)
     return ((*ProcVector[X_ChangeWindowAttributes]) (client));
 }
 
-int
+int _X_COLD
 SProcReparentWindow(ClientPtr client)
 {
     REQUEST(xReparentWindowReq);
@@ -182,7 +182,7 @@ SProcReparentWindow(ClientPtr client)
     return ((*ProcVector[X_ReparentWindow]) (client));
 }
 
-int
+int _X_COLD
 SProcConfigureWindow(ClientPtr client)
 {
     REQUEST(xConfigureWindowReq);
@@ -195,7 +195,7 @@ SProcConfigureWindow(ClientPtr client)
 
 }
 
-int
+int _X_COLD
 SProcInternAtom(ClientPtr client)
 {
     REQUEST(xInternAtomReq);
@@ -205,7 +205,7 @@ SProcInternAtom(ClientPtr client)
     return ((*ProcVector[X_InternAtom]) (client));
 }
 
-int
+int _X_COLD
 SProcChangeProperty(ClientPtr client)
 {
     REQUEST(xChangePropertyReq);
@@ -228,7 +228,7 @@ SProcChangeProperty(ClientPtr client)
     return ((*ProcVector[X_ChangeProperty]) (client));
 }
 
-int
+int _X_COLD
 SProcDeleteProperty(ClientPtr client)
 {
     REQUEST(xDeletePropertyReq);
@@ -240,7 +240,7 @@ SProcDeleteProperty(ClientPtr client)
 
 }
 
-int
+int _X_COLD
 SProcGetProperty(ClientPtr client)
 {
     REQUEST(xGetPropertyReq);
@@ -254,7 +254,7 @@ SProcGetProperty(ClientPtr client)
     return ((*ProcVector[X_GetProperty]) (client));
 }
 
-int
+int _X_COLD
 SProcSetSelectionOwner(ClientPtr client)
 {
     REQUEST(xSetSelectionOwnerReq);
@@ -266,7 +266,7 @@ SProcSetSelectionOwner(ClientPtr client)
     return ((*ProcVector[X_SetSelectionOwner]) (client));
 }
 
-int
+int _X_COLD
 SProcConvertSelection(ClientPtr client)
 {
     REQUEST(xConvertSelectionReq);
@@ -280,7 +280,7 @@ SProcConvertSelection(ClientPtr client)
     return ((*ProcVector[X_ConvertSelection]) (client));
 }
 
-int
+int _X_COLD
 SProcSendEvent(ClientPtr client)
 {
     xEvent eventT = { .u.u.type = 0 };
@@ -302,7 +302,7 @@ SProcSendEvent(ClientPtr client)
     return ((*ProcVector[X_SendEvent]) (client));
 }
 
-int
+int _X_COLD
 SProcGrabPointer(ClientPtr client)
 {
     REQUEST(xGrabPointerReq);
@@ -316,7 +316,7 @@ SProcGrabPointer(ClientPtr client)
     return ((*ProcVector[X_GrabPointer]) (client));
 }
 
-int
+int _X_COLD
 SProcGrabButton(ClientPtr client)
 {
     REQUEST(xGrabButtonReq);
@@ -330,7 +330,7 @@ SProcGrabButton(ClientPtr client)
     return ((*ProcVector[X_GrabButton]) (client));
 }
 
-int
+int _X_COLD
 SProcUngrabButton(ClientPtr client)
 {
     REQUEST(xUngrabButtonReq);
@@ -341,7 +341,7 @@ SProcUngrabButton(ClientPtr client)
     return ((*ProcVector[X_UngrabButton]) (client));
 }
 
-int
+int _X_COLD
 SProcChangeActivePointerGrab(ClientPtr client)
 {
     REQUEST(xChangeActivePointerGrabReq);
@@ -353,7 +353,7 @@ SProcChangeActivePointerGrab(ClientPtr client)
     return ((*ProcVector[X_ChangeActivePointerGrab]) (client));
 }
 
-int
+int _X_COLD
 SProcGrabKeyboard(ClientPtr client)
 {
     REQUEST(xGrabKeyboardReq);
@@ -364,7 +364,7 @@ SProcGrabKeyboard(ClientPtr client)
     return ((*ProcVector[X_GrabKeyboard]) (client));
 }
 
-int
+int _X_COLD
 SProcGrabKey(ClientPtr client)
 {
     REQUEST(xGrabKeyReq);
@@ -375,7 +375,7 @@ SProcGrabKey(ClientPtr client)
     return ((*ProcVector[X_GrabKey]) (client));
 }
 
-int
+int _X_COLD
 SProcUngrabKey(ClientPtr client)
 {
     REQUEST(xUngrabKeyReq);
@@ -386,7 +386,7 @@ SProcUngrabKey(ClientPtr client)
     return ((*ProcVector[X_UngrabKey]) (client));
 }
 
-int
+int _X_COLD
 SProcGetMotionEvents(ClientPtr client)
 {
     REQUEST(xGetMotionEventsReq);
@@ -398,7 +398,7 @@ SProcGetMotionEvents(ClientPtr client)
     return ((*ProcVector[X_GetMotionEvents]) (client));
 }
 
-int
+int _X_COLD
 SProcTranslateCoords(ClientPtr client)
 {
     REQUEST(xTranslateCoordsReq);
@@ -411,7 +411,7 @@ SProcTranslateCoords(ClientPtr client)
     return ((*ProcVector[X_TranslateCoords]) (client));
 }
 
-int
+int _X_COLD
 SProcWarpPointer(ClientPtr client)
 {
     REQUEST(xWarpPointerReq);
@@ -428,7 +428,7 @@ SProcWarpPointer(ClientPtr client)
     return ((*ProcVector[X_WarpPointer]) (client));
 }
 
-int
+int _X_COLD
 SProcSetInputFocus(ClientPtr client)
 {
     REQUEST(xSetInputFocusReq);
@@ -439,7 +439,7 @@ SProcSetInputFocus(ClientPtr client)
     return ((*ProcVector[X_SetInputFocus]) (client));
 }
 
-int
+int _X_COLD
 SProcOpenFont(ClientPtr client)
 {
     REQUEST(xOpenFontReq);
@@ -450,7 +450,7 @@ SProcOpenFont(ClientPtr client)
     return ((*ProcVector[X_OpenFont]) (client));
 }
 
-int
+int _X_COLD
 SProcListFonts(ClientPtr client)
 {
     REQUEST(xListFontsReq);
@@ -461,7 +461,7 @@ SProcListFonts(ClientPtr client)
     return ((*ProcVector[X_ListFonts]) (client));
 }
 
-int
+int _X_COLD
 SProcListFontsWithInfo(ClientPtr client)
 {
     REQUEST(xListFontsWithInfoReq);
@@ -472,7 +472,7 @@ SProcListFontsWithInfo(ClientPtr client)
     return ((*ProcVector[X_ListFontsWithInfo]) (client));
 }
 
-int
+int _X_COLD
 SProcSetFontPath(ClientPtr client)
 {
     REQUEST(xSetFontPathReq);
@@ -482,7 +482,7 @@ SProcSetFontPath(ClientPtr client)
     return ((*ProcVector[X_SetFontPath]) (client));
 }
 
-int
+int _X_COLD
 SProcCreatePixmap(ClientPtr client)
 {
     REQUEST(xCreatePixmapReq);
@@ -496,7 +496,7 @@ SProcCreatePixmap(ClientPtr client)
     return ((*ProcVector[X_CreatePixmap]) (client));
 }
 
-int
+int _X_COLD
 SProcCreateGC(ClientPtr client)
 {
     REQUEST(xCreateGCReq);
@@ -509,7 +509,7 @@ SProcCreateGC(ClientPtr client)
     return ((*ProcVector[X_CreateGC]) (client));
 }
 
-int
+int _X_COLD
 SProcChangeGC(ClientPtr client)
 {
     REQUEST(xChangeGCReq);
@@ -521,7 +521,7 @@ SProcChangeGC(ClientPtr client)
     return ((*ProcVector[X_ChangeGC]) (client));
 }
 
-int
+int _X_COLD
 SProcCopyGC(ClientPtr client)
 {
     REQUEST(xCopyGCReq);
@@ -533,7 +533,7 @@ SProcCopyGC(ClientPtr client)
     return ((*ProcVector[X_CopyGC]) (client));
 }
 
-int
+int _X_COLD
 SProcSetDashes(ClientPtr client)
 {
     REQUEST(xSetDashesReq);
@@ -546,7 +546,7 @@ SProcSetDashes(ClientPtr client)
 
 }
 
-int
+int _X_COLD
 SProcSetClipRectangles(ClientPtr client)
 {
     REQUEST(xSetClipRectanglesReq);
@@ -559,7 +559,7 @@ SProcSetClipRectangles(ClientPtr client)
     return ((*ProcVector[X_SetClipRectangles]) (client));
 }
 
-int
+int _X_COLD
 SProcClearToBackground(ClientPtr client)
 {
     REQUEST(xClearAreaReq);
@@ -573,7 +573,7 @@ SProcClearToBackground(ClientPtr client)
     return ((*ProcVector[X_ClearArea]) (client));
 }
 
-int
+int _X_COLD
 SProcCopyArea(ClientPtr client)
 {
     REQUEST(xCopyAreaReq);
@@ -591,7 +591,7 @@ SProcCopyArea(ClientPtr client)
     return ((*ProcVector[X_CopyArea]) (client));
 }
 
-int
+int _X_COLD
 SProcCopyPlane(ClientPtr client)
 {
     REQUEST(xCopyPlaneReq);
@@ -612,7 +612,7 @@ SProcCopyPlane(ClientPtr client)
 
 /* The following routine is used for all Poly drawing requests
    (except FillPoly, which uses a different request format) */
-int
+int _X_COLD
 SProcPoly(ClientPtr client)
 {
     REQUEST(xPolyPointReq);
@@ -627,7 +627,7 @@ SProcPoly(ClientPtr client)
 /* cannot use SProcPoly for this one, because xFillPolyReq
    is longer than xPolyPointReq, and we don't want to swap
    the difference as shorts! */
-int
+int _X_COLD
 SProcFillPoly(ClientPtr client)
 {
     REQUEST(xFillPolyReq);
@@ -639,7 +639,7 @@ SProcFillPoly(ClientPtr client)
     return ((*ProcVector[X_FillPoly]) (client));
 }
 
-int
+int _X_COLD
 SProcPutImage(ClientPtr client)
 {
     REQUEST(xPutImageReq);
@@ -656,7 +656,7 @@ SProcPutImage(ClientPtr client)
 
 }
 
-int
+int _X_COLD
 SProcGetImage(ClientPtr client)
 {
     REQUEST(xGetImageReq);
@@ -673,7 +673,7 @@ SProcGetImage(ClientPtr client)
 
 /* ProcPolyText used for both PolyText8 and PolyText16 */
 
-int
+int _X_COLD
 SProcPolyText(ClientPtr client)
 {
     REQUEST(xPolyTextReq);
@@ -688,7 +688,7 @@ SProcPolyText(ClientPtr client)
 
 /* ProcImageText used for both ImageText8 and ImageText16 */
 
-int
+int _X_COLD
 SProcImageText(ClientPtr client)
 {
     REQUEST(xImageTextReq);
@@ -701,7 +701,7 @@ SProcImageText(ClientPtr client)
     return ((*ProcVector[stuff->reqType]) (client));
 }
 
-int
+int _X_COLD
 SProcCreateColormap(ClientPtr client)
 {
     REQUEST(xCreateColormapReq);
@@ -713,7 +713,7 @@ SProcCreateColormap(ClientPtr client)
     return ((*ProcVector[X_CreateColormap]) (client));
 }
 
-int
+int _X_COLD
 SProcCopyColormapAndFree(ClientPtr client)
 {
     REQUEST(xCopyColormapAndFreeReq);
@@ -725,7 +725,7 @@ SProcCopyColormapAndFree(ClientPtr client)
 
 }
 
-int
+int _X_COLD
 SProcAllocColor(ClientPtr client)
 {
     REQUEST(xAllocColorReq);
@@ -738,7 +738,7 @@ SProcAllocColor(ClientPtr client)
     return ((*ProcVector[X_AllocColor]) (client));
 }
 
-int
+int _X_COLD
 SProcAllocNamedColor(ClientPtr client)
 {
     REQUEST(xAllocNamedColorReq);
@@ -749,7 +749,7 @@ SProcAllocNamedColor(ClientPtr client)
     return ((*ProcVector[X_AllocNamedColor]) (client));
 }
 
-int
+int _X_COLD
 SProcAllocColorCells(ClientPtr client)
 {
     REQUEST(xAllocColorCellsReq);
@@ -761,7 +761,7 @@ SProcAllocColorCells(ClientPtr client)
     return ((*ProcVector[X_AllocColorCells]) (client));
 }
 
-int
+int _X_COLD
 SProcAllocColorPlanes(ClientPtr client)
 {
     REQUEST(xAllocColorPlanesReq);
@@ -775,7 +775,7 @@ SProcAllocColorPlanes(ClientPtr client)
     return ((*ProcVector[X_AllocColorPlanes]) (client));
 }
 
-int
+int _X_COLD
 SProcFreeColors(ClientPtr client)
 {
     REQUEST(xFreeColorsReq);
@@ -788,7 +788,7 @@ SProcFreeColors(ClientPtr client)
 
 }
 
-void
+void _X_COLD
 SwapColorItem(xColorItem * pItem)
 {
     swapl(&pItem->pixel);
@@ -797,7 +797,7 @@ SwapColorItem(xColorItem * pItem)
     swaps(&pItem->blue);
 }
 
-int
+int _X_COLD
 SProcStoreColors(ClientPtr client)
 {
     long count;
@@ -813,7 +813,7 @@ SProcStoreColors(ClientPtr client)
     return ((*ProcVector[X_StoreColors]) (client));
 }
 
-int
+int _X_COLD
 SProcStoreNamedColor(ClientPtr client)
 {
     REQUEST(xStoreNamedColorReq);
@@ -825,7 +825,7 @@ SProcStoreNamedColor(ClientPtr client)
     return ((*ProcVector[X_StoreNamedColor]) (client));
 }
 
-int
+int _X_COLD
 SProcQueryColors(ClientPtr client)
 {
     REQUEST(xQueryColorsReq);
@@ -836,7 +836,7 @@ SProcQueryColors(ClientPtr client)
     return ((*ProcVector[X_QueryColors]) (client));
 }
 
-int
+int _X_COLD
 SProcLookupColor(ClientPtr client)
 {
     REQUEST(xLookupColorReq);
@@ -847,7 +847,7 @@ SProcLookupColor(ClientPtr client)
     return ((*ProcVector[X_LookupColor]) (client));
 }
 
-int
+int _X_COLD
 SProcCreateCursor(ClientPtr client)
 {
     REQUEST(xCreateCursorReq);
@@ -867,7 +867,7 @@ SProcCreateCursor(ClientPtr client)
     return ((*ProcVector[X_CreateCursor]) (client));
 }
 
-int
+int _X_COLD
 SProcCreateGlyphCursor(ClientPtr client)
 {
     REQUEST(xCreateGlyphCursorReq);
@@ -887,7 +887,7 @@ SProcCreateGlyphCursor(ClientPtr client)
     return ((*ProcVector[X_CreateGlyphCursor]) (client));
 }
 
-int
+int _X_COLD
 SProcRecolorCursor(ClientPtr client)
 {
     REQUEST(xRecolorCursorReq);
@@ -903,7 +903,7 @@ SProcRecolorCursor(ClientPtr client)
     return ((*ProcVector[X_RecolorCursor]) (client));
 }
 
-int
+int _X_COLD
 SProcQueryBestSize(ClientPtr client)
 {
     REQUEST(xQueryBestSizeReq);
@@ -916,7 +916,7 @@ SProcQueryBestSize(ClientPtr client)
 
 }
 
-int
+int _X_COLD
 SProcQueryExtension(ClientPtr client)
 {
     REQUEST(xQueryExtensionReq);
@@ -926,7 +926,7 @@ SProcQueryExtension(ClientPtr client)
     return ((*ProcVector[X_QueryExtension]) (client));
 }
 
-int
+int _X_COLD
 SProcChangeKeyboardMapping(ClientPtr client)
 {
     REQUEST(xChangeKeyboardMappingReq);
@@ -936,7 +936,7 @@ SProcChangeKeyboardMapping(ClientPtr client)
     return ((*ProcVector[X_ChangeKeyboardMapping]) (client));
 }
 
-int
+int _X_COLD
 SProcChangeKeyboardControl(ClientPtr client)
 {
     REQUEST(xChangeKeyboardControlReq);
@@ -947,7 +947,7 @@ SProcChangeKeyboardControl(ClientPtr client)
     return ((*ProcVector[X_ChangeKeyboardControl]) (client));
 }
 
-int
+int _X_COLD
 SProcChangePointerControl(ClientPtr client)
 {
     REQUEST(xChangePointerControlReq);
@@ -959,7 +959,7 @@ SProcChangePointerControl(ClientPtr client)
     return ((*ProcVector[X_ChangePointerControl]) (client));
 }
 
-int
+int _X_COLD
 SProcSetScreenSaver(ClientPtr client)
 {
     REQUEST(xSetScreenSaverReq);
@@ -970,7 +970,7 @@ SProcSetScreenSaver(ClientPtr client)
     return ((*ProcVector[X_SetScreenSaver]) (client));
 }
 
-int
+int _X_COLD
 SProcChangeHosts(ClientPtr client)
 {
     REQUEST(xChangeHostsReq);
@@ -981,7 +981,7 @@ SProcChangeHosts(ClientPtr client)
 
 }
 
-int
+int _X_COLD
 SProcRotateProperties(ClientPtr client)
 {
     REQUEST(xRotatePropertiesReq);
@@ -994,7 +994,7 @@ SProcRotateProperties(ClientPtr client)
     return ((*ProcVector[X_RotateProperties]) (client));
 }
 
-int
+int _X_COLD
 SProcNoOperation(ClientPtr client)
 {
     REQUEST(xReq);
@@ -1002,7 +1002,7 @@ SProcNoOperation(ClientPtr client)
     return ((*ProcVector[X_NoOperation]) (client));
 }
 
-void
+void _X_COLD
 SwapConnClientPrefix(xConnClientPrefix * pCCP)
 {
     swaps(&pCCP->majorVersion);
diff --git a/dri3/dri3_request.c b/dri3/dri3_request.c
index 8c15dbe..b28d883 100644
--- a/dri3/dri3_request.c
+++ b/dri3/dri3_request.c
@@ -319,7 +319,7 @@ proc_dri3_dispatch(ClientPtr client)
     return (*proc_dri3_vector[stuff->data]) (client);
 }
 
-static int
+static int _X_COLD
 sproc_dri3_query_version(ClientPtr client)
 {
     REQUEST(xDRI3QueryVersionReq);
@@ -331,7 +331,7 @@ sproc_dri3_query_version(ClientPtr client)
     return (*proc_dri3_vector[stuff->dri3ReqType]) (client);
 }
 
-static int
+static int _X_COLD
 sproc_dri3_open(ClientPtr client)
 {
     REQUEST(xDRI3OpenReq);
@@ -343,7 +343,7 @@ sproc_dri3_open(ClientPtr client)
     return (*proc_dri3_vector[stuff->dri3ReqType]) (client);
 }
 
-static int
+static int _X_COLD
 sproc_dri3_pixmap_from_buffer(ClientPtr client)
 {
     REQUEST(xDRI3PixmapFromBufferReq);
@@ -359,7 +359,7 @@ sproc_dri3_pixmap_from_buffer(ClientPtr client)
     return (*proc_dri3_vector[stuff->dri3ReqType]) (client);
 }
 
-static int
+static int _X_COLD
 sproc_dri3_buffer_from_pixmap(ClientPtr client)
 {
     REQUEST(xDRI3BufferFromPixmapReq);
@@ -370,7 +370,7 @@ sproc_dri3_buffer_from_pixmap(ClientPtr client)
     return (*proc_dri3_vector[stuff->dri3ReqType]) (client);
 }
 
-static int
+static int _X_COLD
 sproc_dri3_fence_from_fd(ClientPtr client)
 {
     REQUEST(xDRI3FenceFromFDReq);
@@ -382,7 +382,7 @@ sproc_dri3_fence_from_fd(ClientPtr client)
     return (*proc_dri3_vector[stuff->dri3ReqType]) (client);
 }
 
-static int
+static int _X_COLD
 sproc_dri3_fd_from_fence(ClientPtr client)
 {
     REQUEST(xDRI3FDFromFenceReq);
@@ -403,7 +403,7 @@ int (*sproc_dri3_vector[DRI3NumberRequests]) (ClientPtr) = {
     sproc_dri3_fd_from_fence,           /* 5 */
 };
 
-int
+int _X_COLD
 sproc_dri3_dispatch(ClientPtr client)
 {
     REQUEST(xReq);
diff --git a/hw/dmx/dmx.c b/hw/dmx/dmx.c
index 9729963..6c36142 100644
--- a/hw/dmx/dmx.c
+++ b/hw/dmx/dmx.c
@@ -969,7 +969,7 @@ ProcDMXDispatch(ClientPtr client)
     }
 }
 
-static int
+static int _X_COLD
 SProcDMXQueryVersion(ClientPtr client)
 {
     REQUEST(xDMXQueryVersionReq);
@@ -979,7 +979,7 @@ SProcDMXQueryVersion(ClientPtr client)
     return ProcDMXQueryVersion(client);
 }
 
-static int
+static int _X_COLD
 SProcDMXSync(ClientPtr client)
 {
     REQUEST(xDMXSyncReq);
@@ -989,7 +989,7 @@ SProcDMXSync(ClientPtr client)
     return ProcDMXSync(client);
 }
 
-static int
+static int _X_COLD
 SProcDMXForceWindowCreation(ClientPtr client)
 {
     REQUEST(xDMXForceWindowCreationReq);
@@ -1000,7 +1000,7 @@ SProcDMXForceWindowCreation(ClientPtr client)
     return ProcDMXForceWindowCreation(client);
 }
 
-static int
+static int _X_COLD
 SProcDMXGetScreenCount(ClientPtr client)
 {
     REQUEST(xDMXGetScreenCountReq);
@@ -1010,7 +1010,7 @@ SProcDMXGetScreenCount(ClientPtr client)
     return ProcDMXGetScreenCount(client);
 }
 
-static int
+static int _X_COLD
 SProcDMXGetScreenAttributes(ClientPtr client)
 {
     REQUEST(xDMXGetScreenAttributesReq);
@@ -1021,7 +1021,7 @@ SProcDMXGetScreenAttributes(ClientPtr client)
     return ProcDMXGetScreenAttributes(client);
 }
 
-static int
+static int _X_COLD
 SProcDMXChangeScreensAttributes(ClientPtr client)
 {
     REQUEST(xDMXChangeScreensAttributesReq);
@@ -1034,7 +1034,7 @@ SProcDMXChangeScreensAttributes(ClientPtr client)
     return ProcDMXGetScreenAttributes(client);
 }
 
-static int
+static int _X_COLD
 SProcDMXAddScreen(ClientPtr client)
 {
     int paddedLength;
@@ -1050,7 +1050,7 @@ SProcDMXAddScreen(ClientPtr client)
     return ProcDMXAddScreen(client);
 }
 
-static int
+static int _X_COLD
 SProcDMXRemoveScreen(ClientPtr client)
 {
     REQUEST(xDMXRemoveScreenReq);
@@ -1061,7 +1061,7 @@ SProcDMXRemoveScreen(ClientPtr client)
     return ProcDMXRemoveScreen(client);
 }
 
-static int
+static int _X_COLD
 SProcDMXGetWindowAttributes(ClientPtr client)
 {
     REQUEST(xDMXGetWindowAttributesReq);
@@ -1072,7 +1072,7 @@ SProcDMXGetWindowAttributes(ClientPtr client)
     return ProcDMXGetWindowAttributes(client);
 }
 
-static int
+static int _X_COLD
 SProcDMXGetDesktopAttributes(ClientPtr client)
 {
     REQUEST(xDMXGetDesktopAttributesReq);
@@ -1082,7 +1082,7 @@ SProcDMXGetDesktopAttributes(ClientPtr client)
     return ProcDMXGetDesktopAttributes(client);
 }
 
-static int
+static int _X_COLD
 SProcDMXChangeDesktopAttributes(ClientPtr client)
 {
     REQUEST(xDMXChangeDesktopAttributesReq);
@@ -1094,7 +1094,7 @@ SProcDMXChangeDesktopAttributes(ClientPtr client)
     return ProcDMXChangeDesktopAttributes(client);
 }
 
-static int
+static int _X_COLD
 SProcDMXGetInputCount(ClientPtr client)
 {
     REQUEST(xDMXGetInputCountReq);
@@ -1104,7 +1104,7 @@ SProcDMXGetInputCount(ClientPtr client)
     return ProcDMXGetInputCount(client);
 }
 
-static int
+static int _X_COLD
 SProcDMXGetInputAttributes(ClientPtr client)
 {
     REQUEST(xDMXGetInputAttributesReq);
@@ -1115,7 +1115,7 @@ SProcDMXGetInputAttributes(ClientPtr client)
     return ProcDMXGetInputAttributes(client);
 }
 
-static int
+static int _X_COLD
 SProcDMXAddInput(ClientPtr client)
 {
     int paddedLength;
@@ -1131,7 +1131,7 @@ SProcDMXAddInput(ClientPtr client)
     return ProcDMXAddInput(client);
 }
 
-static int
+static int _X_COLD
 SProcDMXRemoveInput(ClientPtr client)
 {
     REQUEST(xDMXRemoveInputReq);
@@ -1142,7 +1142,7 @@ SProcDMXRemoveInput(ClientPtr client)
     return ProcDMXRemoveInput(client);
 }
 
-static int
+static int _X_COLD
 SProcDMXDispatch(ClientPtr client)
 {
     REQUEST(xReq);
diff --git a/hw/xfree86/common/xf86DGA.c b/hw/xfree86/common/xf86DGA.c
index c689dcb..95434e8 100644
--- a/hw/xfree86/common/xf86DGA.c
+++ b/hw/xfree86/common/xf86DGA.c
@@ -2052,7 +2052,7 @@ ProcXF86DGAViewPortChanged(ClientPtr client)
 
 #endif                          /* DGA_PROTOCOL_OLD_SUPPORT */
 
-static int
+static int _X_COLD
 SProcXDGADispatch(ClientPtr client)
 {
     return DGAErrorBase + XF86DGAClientNotLocal;
diff --git a/hw/xfree86/dri/xf86dri.c b/hw/xfree86/dri/xf86dri.c
index fcae73d..8f3c2d6 100644
--- a/hw/xfree86/dri/xf86dri.c
+++ b/hw/xfree86/dri/xf86dri.c
@@ -558,7 +558,7 @@ ProcXF86DRIDispatch(register ClientPtr client)
     }
 }
 
-static int
+static int _X_COLD
 SProcXF86DRIQueryVersion(register ClientPtr client)
 {
     REQUEST(xXF86DRIQueryVersionReq);
@@ -566,7 +566,7 @@ SProcXF86DRIQueryVersion(register ClientPtr client)
     return ProcXF86DRIQueryVersion(client);
 }
 
-static int
+static int _X_COLD
 SProcXF86DRIQueryDirectRenderingCapable(register ClientPtr client)
 {
     REQUEST(xXF86DRIQueryDirectRenderingCapableReq);
@@ -575,7 +575,7 @@ SProcXF86DRIQueryDirectRenderingCapable(register ClientPtr client)
     return ProcXF86DRIQueryDirectRenderingCapable(client);
 }
 
-static int
+static int _X_COLD
 SProcXF86DRIDispatch(register ClientPtr client)
 {
     REQUEST(xReq);
diff --git a/hw/xfree86/dri2/dri2ext.c b/hw/xfree86/dri2/dri2ext.c
index 520b7cf..529de75 100644
--- a/hw/xfree86/dri2/dri2ext.c
+++ b/hw/xfree86/dri2/dri2ext.c
@@ -634,7 +634,7 @@ ProcDRI2Dispatch(ClientPtr client)
     }
 }
 
-static int
+static int _X_COLD
 SProcDRI2Connect(ClientPtr client)
 {
     REQUEST(xDRI2ConnectReq);
@@ -659,7 +659,7 @@ SProcDRI2Connect(ClientPtr client)
     return Success;
 }
 
-static int
+static int _X_COLD
 SProcDRI2Dispatch(ClientPtr client)
 {
     REQUEST(xReq);
diff --git a/present/present_request.c b/present/present_request.c
index c7663fc..c6afe5f 100644
--- a/present/present_request.c
+++ b/present/present_request.c
@@ -249,7 +249,7 @@ proc_present_dispatch(ClientPtr client)
     return (*proc_present_vector[stuff->data]) (client);
 }
 
-static int
+static int _X_COLD
 sproc_present_query_version(ClientPtr client)
 {
     REQUEST(xPresentQueryVersionReq);
@@ -261,7 +261,7 @@ sproc_present_query_version(ClientPtr client)
     return (*proc_present_vector[stuff->presentReqType]) (client);
 }
 
-static int
+static int _X_COLD
 sproc_present_pixmap(ClientPtr client)
 {
     REQUEST(xPresentPixmapReq);
@@ -281,7 +281,7 @@ sproc_present_pixmap(ClientPtr client)
     return (*proc_present_vector[stuff->presentReqType]) (client);
 }
 
-static int
+static int _X_COLD
 sproc_present_notify_msc(ClientPtr client)
 {
     REQUEST(xPresentNotifyMSCReq);
@@ -295,7 +295,7 @@ sproc_present_notify_msc(ClientPtr client)
     return (*proc_present_vector[stuff->presentReqType]) (client);
 }
 
-static int
+static int _X_COLD
 sproc_present_select_input (ClientPtr client)
 {
     REQUEST(xPresentSelectInputReq);
@@ -307,7 +307,7 @@ sproc_present_select_input (ClientPtr client)
     return (*proc_present_vector[stuff->presentReqType]) (client);
 }
 
-static int
+static int _X_COLD
 sproc_present_query_capabilities (ClientPtr client)
 {
     REQUEST(xPresentQueryCapabilitiesReq);
@@ -325,7 +325,7 @@ static int (*sproc_present_vector[PresentNumberRequests]) (ClientPtr) = {
     sproc_present_query_capabilities,      /* 4 */
 };
 
-int
+int _X_COLD
 sproc_present_dispatch(ClientPtr client)
 {
     REQUEST(xReq);
diff --git a/randr/randr.c b/randr/randr.c
index 0138dc1..507158e 100644
--- a/randr/randr.c
+++ b/randr/randr.c
@@ -211,7 +211,7 @@ SRRProviderPropertyNotifyEvent(xRRProviderPropertyNotifyEvent * from,
     /* pad4 */
 }
 
-static void
+static void _X_COLD
 SRRResourceChangeNotifyEvent(xRRResourceChangeNotifyEvent * from,
                              xRRResourceChangeNotifyEvent * to)
 {
@@ -222,7 +222,7 @@ SRRResourceChangeNotifyEvent(xRRResourceChangeNotifyEvent * from,
     cpswapl(from->window, to->window);
 }
 
-static void
+static void _X_COLD
 SRRNotifyEvent(xEvent *from, xEvent *to)
 {
     switch (from->u.u.detail) {
@@ -682,7 +682,7 @@ ProcRRDispatch(ClientPtr client)
     return (*ProcRandrVector[stuff->data]) (client);
 }
 
-static int
+static int _X_COLD
 SProcRRDispatch(ClientPtr client)
 {
     REQUEST(xReq);
diff --git a/randr/rrsdispatch.c b/randr/rrsdispatch.c
index cf2a3b0..e0ffaa4 100644
--- a/randr/rrsdispatch.c
+++ b/randr/rrsdispatch.c
@@ -22,7 +22,7 @@
 
 #include "randrstr.h"
 
-static int
+static int _X_COLD
 SProcRRQueryVersion(ClientPtr client)
 {
     REQUEST(xRRQueryVersionReq);
@@ -34,7 +34,7 @@ SProcRRQueryVersion(ClientPtr client)
     return (*ProcRandrVector[stuff->randrReqType]) (client);
 }
 
-static int
+static int _X_COLD
 SProcRRGetScreenInfo(ClientPtr client)
 {
     REQUEST(xRRGetScreenInfoReq);
@@ -45,7 +45,7 @@ SProcRRGetScreenInfo(ClientPtr client)
     return (*ProcRandrVector[stuff->randrReqType]) (client);
 }
 
-static int
+static int _X_COLD
 SProcRRSetScreenConfig(ClientPtr client)
 {
     REQUEST(xRRSetScreenConfigReq);
@@ -66,7 +66,7 @@ SProcRRSetScreenConfig(ClientPtr client)
     return (*ProcRandrVector[stuff->randrReqType]) (client);
 }
 
-static int
+static int _X_COLD
 SProcRRSelectInput(ClientPtr client)
 {
     REQUEST(xRRSelectInputReq);
@@ -78,7 +78,7 @@ SProcRRSelectInput(ClientPtr client)
     return (*ProcRandrVector[stuff->randrReqType]) (client);
 }
 
-static int
+static int _X_COLD
 SProcRRGetScreenSizeRange(ClientPtr client)
 {
     REQUEST(xRRGetScreenSizeRangeReq);
@@ -89,7 +89,7 @@ SProcRRGetScreenSizeRange(ClientPtr client)
     return (*ProcRandrVector[stuff->randrReqType]) (client);
 }
 
-static int
+static int _X_COLD
 SProcRRSetScreenSize(ClientPtr client)
 {
     REQUEST(xRRSetScreenSizeReq);
@@ -104,7 +104,7 @@ SProcRRSetScreenSize(ClientPtr client)
     return (*ProcRandrVector[stuff->randrReqType]) (client);
 }
 
-static int
+static int _X_COLD
 SProcRRGetScreenResources(ClientPtr client)
 {
     REQUEST(xRRGetScreenResourcesReq);
@@ -115,7 +115,7 @@ SProcRRGetScreenResources(ClientPtr client)
     return (*ProcRandrVector[stuff->randrReqType]) (client);
 }
 
-static int
+static int _X_COLD
 SProcRRGetOutputInfo(ClientPtr client)
 {
     REQUEST(xRRGetOutputInfoReq);
@@ -127,7 +127,7 @@ SProcRRGetOutputInfo(ClientPtr client)
     return (*ProcRandrVector[stuff->randrReqType]) (client);
 }
 
-static int
+static int _X_COLD
 SProcRRListOutputProperties(ClientPtr client)
 {
     REQUEST(xRRListOutputPropertiesReq);
@@ -138,7 +138,7 @@ SProcRRListOutputProperties(ClientPtr client)
     return (*ProcRandrVector[stuff->randrReqType]) (client);
 }
 
-static int
+static int _X_COLD
 SProcRRQueryOutputProperty(ClientPtr client)
 {
     REQUEST(xRRQueryOutputPropertyReq);
@@ -150,7 +150,7 @@ SProcRRQueryOutputProperty(ClientPtr client)
     return (*ProcRandrVector[stuff->randrReqType]) (client);
 }
 
-static int
+static int _X_COLD
 SProcRRConfigureOutputProperty(ClientPtr client)
 {
     REQUEST(xRRConfigureOutputPropertyReq);
@@ -163,7 +163,7 @@ SProcRRConfigureOutputProperty(ClientPtr client)
     return (*ProcRandrVector[stuff->randrReqType]) (client);
 }
 
-static int
+static int _X_COLD
 SProcRRChangeOutputProperty(ClientPtr client)
 {
     REQUEST(xRRChangeOutputPropertyReq);
@@ -190,7 +190,7 @@ SProcRRChangeOutputProperty(ClientPtr client)
     return (*ProcRandrVector[stuff->randrReqType]) (client);
 }
 
-static int
+static int _X_COLD
 SProcRRDeleteOutputProperty(ClientPtr client)
 {
     REQUEST(xRRDeleteOutputPropertyReq);
@@ -202,7 +202,7 @@ SProcRRDeleteOutputProperty(ClientPtr client)
     return (*ProcRandrVector[stuff->randrReqType]) (client);
 }
 
-static int
+static int _X_COLD
 SProcRRGetOutputProperty(ClientPtr client)
 {
     REQUEST(xRRGetOutputPropertyReq);
@@ -217,7 +217,7 @@ SProcRRGetOutputProperty(ClientPtr client)
     return (*ProcRandrVector[stuff->randrReqType]) (client);
 }
 
-static int
+static int _X_COLD
 SProcRRCreateMode(ClientPtr client)
 {
     xRRModeInfo *modeinfo;
@@ -244,7 +244,7 @@ SProcRRCreateMode(ClientPtr client)
     return (*ProcRandrVector[stuff->randrReqType]) (client);
 }
 
-static int
+static int _X_COLD
 SProcRRDestroyMode(ClientPtr client)
 {
     REQUEST(xRRDestroyModeReq);
@@ -255,7 +255,7 @@ SProcRRDestroyMode(ClientPtr client)
     return (*ProcRandrVector[stuff->randrReqType]) (client);
 }
 
-static int
+static int _X_COLD
 SProcRRAddOutputMode(ClientPtr client)
 {
     REQUEST(xRRAddOutputModeReq);
@@ -267,7 +267,7 @@ SProcRRAddOutputMode(ClientPtr client)
     return (*ProcRandrVector[stuff->randrReqType]) (client);
 }
 
-static int
+static int _X_COLD
 SProcRRDeleteOutputMode(ClientPtr client)
 {
     REQUEST(xRRDeleteOutputModeReq);
@@ -279,7 +279,7 @@ SProcRRDeleteOutputMode(ClientPtr client)
     return (*ProcRandrVector[stuff->randrReqType]) (client);
 }
 
-static int
+static int _X_COLD
 SProcRRGetCrtcInfo(ClientPtr client)
 {
     REQUEST(xRRGetCrtcInfoReq);
@@ -291,7 +291,7 @@ SProcRRGetCrtcInfo(ClientPtr client)
     return (*ProcRandrVector[stuff->randrReqType]) (client);
 }
 
-static int
+static int _X_COLD
 SProcRRSetCrtcConfig(ClientPtr client)
 {
     REQUEST(xRRSetCrtcConfigReq);
@@ -309,7 +309,7 @@ SProcRRSetCrtcConfig(ClientPtr client)
     return (*ProcRandrVector[stuff->randrReqType]) (client);
 }
 
-static int
+static int _X_COLD
 SProcRRGetCrtcGammaSize(ClientPtr client)
 {
     REQUEST(xRRGetCrtcGammaSizeReq);
@@ -320,7 +320,7 @@ SProcRRGetCrtcGammaSize(ClientPtr client)
     return (*ProcRandrVector[stuff->randrReqType]) (client);
 }
 
-static int
+static int _X_COLD
 SProcRRGetCrtcGamma(ClientPtr client)
 {
     REQUEST(xRRGetCrtcGammaReq);
@@ -331,7 +331,7 @@ SProcRRGetCrtcGamma(ClientPtr client)
     return (*ProcRandrVector[stuff->randrReqType]) (client);
 }
 
-static int
+static int _X_COLD
 SProcRRSetCrtcGamma(ClientPtr client)
 {
     REQUEST(xRRSetCrtcGammaReq);
@@ -344,7 +344,7 @@ SProcRRSetCrtcGamma(ClientPtr client)
     return (*ProcRandrVector[stuff->randrReqType]) (client);
 }
 
-static int
+static int _X_COLD
 SProcRRSetCrtcTransform(ClientPtr client)
 {
     int nparams;
@@ -369,7 +369,7 @@ SProcRRSetCrtcTransform(ClientPtr client)
     return (*ProcRandrVector[stuff->randrReqType]) (client);
 }
 
-static int
+static int _X_COLD
 SProcRRGetCrtcTransform(ClientPtr client)
 {
     REQUEST(xRRGetCrtcTransformReq);
@@ -380,7 +380,7 @@ SProcRRGetCrtcTransform(ClientPtr client)
     return (*ProcRandrVector[stuff->randrReqType]) (client);
 }
 
-static int
+static int _X_COLD
 SProcRRGetPanning(ClientPtr client)
 {
     REQUEST(xRRGetPanningReq);
@@ -391,7 +391,7 @@ SProcRRGetPanning(ClientPtr client)
     return (*ProcRandrVector[stuff->randrReqType]) (client);
 }
 
-static int
+static int _X_COLD
 SProcRRSetPanning(ClientPtr client)
 {
     REQUEST(xRRSetPanningReq);
@@ -415,7 +415,7 @@ SProcRRSetPanning(ClientPtr client)
     return (*ProcRandrVector[stuff->randrReqType]) (client);
 }
 
-static int
+static int _X_COLD
 SProcRRSetOutputPrimary(ClientPtr client)
 {
     REQUEST(xRRSetOutputPrimaryReq);
@@ -427,7 +427,7 @@ SProcRRSetOutputPrimary(ClientPtr client)
     return ProcRandrVector[stuff->randrReqType] (client);
 }
 
-static int
+static int _X_COLD
 SProcRRGetOutputPrimary(ClientPtr client)
 {
     REQUEST(xRRGetOutputPrimaryReq);
@@ -438,7 +438,8 @@ SProcRRGetOutputPrimary(ClientPtr client)
     return ProcRandrVector[stuff->randrReqType] (client);
 }
 
-static int SProcRRGetProviders(ClientPtr client)
+static int _X_COLD
+SProcRRGetProviders(ClientPtr client)
 {
     REQUEST(xRRGetProvidersReq);
 
@@ -448,7 +449,8 @@ static int SProcRRGetProviders(ClientPtr client)
     return ProcRandrVector[stuff->randrReqType] (client);
 }
 
-static int SProcRRGetProviderInfo(ClientPtr client)
+static int _X_COLD
+SProcRRGetProviderInfo(ClientPtr client)
 {
     REQUEST(xRRGetProviderInfoReq);
 
@@ -459,7 +461,8 @@ static int SProcRRGetProviderInfo(ClientPtr client)
     return ProcRandrVector[stuff->randrReqType] (client);
 }
 
-static int SProcRRSetProviderOffloadSink(ClientPtr client)
+static int _X_COLD
+SProcRRSetProviderOffloadSink(ClientPtr client)
 {
     REQUEST(xRRSetProviderOffloadSinkReq);
 
@@ -471,7 +474,8 @@ static int SProcRRSetProviderOffloadSink(ClientPtr client)
     return ProcRandrVector[stuff->randrReqType] (client);
 }
 
-static int SProcRRSetProviderOutputSource(ClientPtr client)
+static int _X_COLD
+SProcRRSetProviderOutputSource(ClientPtr client)
 {
     REQUEST(xRRSetProviderOutputSourceReq);
 
@@ -483,7 +487,8 @@ static int SProcRRSetProviderOutputSource(ClientPtr client)
     return ProcRandrVector[stuff->randrReqType] (client);
 }
 
-static int SProcRRListProviderProperties(ClientPtr client)
+static int _X_COLD
+SProcRRListProviderProperties(ClientPtr client)
 {
     REQUEST(xRRListProviderPropertiesReq);
 
@@ -493,7 +498,8 @@ static int SProcRRListProviderProperties(ClientPtr client)
     return ProcRandrVector[stuff->randrReqType] (client);
 }
 
-static int SProcRRQueryProviderProperty(ClientPtr client)
+static int _X_COLD
+SProcRRQueryProviderProperty(ClientPtr client)
 {
     REQUEST(xRRQueryProviderPropertyReq);
 
@@ -504,7 +510,8 @@ static int SProcRRQueryProviderProperty(ClientPtr client)
     return ProcRandrVector[stuff->randrReqType] (client);
 }
 
-static int SProcRRConfigureProviderProperty(ClientPtr client)
+static int _X_COLD
+SProcRRConfigureProviderProperty(ClientPtr client)
 {
     REQUEST(xRRConfigureProviderPropertyReq);
 
@@ -517,7 +524,8 @@ static int SProcRRConfigureProviderProperty(ClientPtr client)
     return ProcRandrVector[stuff->randrReqType] (client);
 }
 
-static int SProcRRChangeProviderProperty(ClientPtr client)
+static int _X_COLD
+SProcRRChangeProviderProperty(ClientPtr client)
 {
     REQUEST(xRRChangeProviderPropertyReq);
 
@@ -540,7 +548,8 @@ static int SProcRRChangeProviderProperty(ClientPtr client)
     return ProcRandrVector[stuff->randrReqType] (client);
 }
 
-static int SProcRRDeleteProviderProperty(ClientPtr client)
+static int _X_COLD
+SProcRRDeleteProviderProperty(ClientPtr client)
 {
     REQUEST(xRRDeleteProviderPropertyReq);
 
@@ -551,7 +560,8 @@ static int SProcRRDeleteProviderProperty(ClientPtr client)
     return ProcRandrVector[stuff->randrReqType] (client);
 }
 
-static int SProcRRGetProviderProperty(ClientPtr client)
+static int _X_COLD
+SProcRRGetProviderProperty(ClientPtr client)
 {
     REQUEST(xRRGetProviderPropertyReq);
 
@@ -565,7 +575,8 @@ static int SProcRRGetProviderProperty(ClientPtr client)
     return ProcRandrVector[stuff->randrReqType] (client);
 }
 
-static int SProcRRGetMonitors(ClientPtr client) {
+static int _X_COLD
+SProcRRGetMonitors(ClientPtr client) {
     REQUEST(xRRGetMonitorsReq);
 
     REQUEST_SIZE_MATCH(xRRGetMonitorsReq);
@@ -574,7 +585,8 @@ static int SProcRRGetMonitors(ClientPtr client) {
     return ProcRandrVector[stuff->randrReqType] (client);
 }
 
-static int SProcRRSetMonitor(ClientPtr client) {
+static int _X_COLD
+SProcRRSetMonitor(ClientPtr client) {
     REQUEST(xRRSetMonitorReq);
 
     REQUEST_AT_LEAST_SIZE(xRRGetMonitorsReq);
@@ -590,7 +602,8 @@ static int SProcRRSetMonitor(ClientPtr client) {
     return ProcRandrVector[stuff->randrReqType] (client);
 }
 
-static int SProcRRDeleteMonitor(ClientPtr client) {
+static int _X_COLD
+SProcRRDeleteMonitor(ClientPtr client) {
     REQUEST(xRRDeleteMonitorReq);
 
     REQUEST_SIZE_MATCH(xRRDeleteMonitorReq);
diff --git a/randr/rrxinerama.c b/randr/rrxinerama.c
index 8f499df..5f01e95 100644
--- a/randr/rrxinerama.c
+++ b/randr/rrxinerama.c
@@ -82,7 +82,7 @@ static int ProcRRXineramaGetScreenCount(ClientPtr client);
 static int ProcRRXineramaGetScreenSize(ClientPtr client);
 static int ProcRRXineramaIsActive(ClientPtr client);
 static int ProcRRXineramaQueryScreens(ClientPtr client);
-static int SProcRRXineramaDispatch(ClientPtr client);
+static int _X_COLD SProcRRXineramaDispatch(ClientPtr client);
 
 Bool noRRXineramaExtension = FALSE;
 
@@ -332,7 +332,7 @@ ProcRRXineramaDispatch(ClientPtr client)
 
 /* SProc */
 
-static int
+static int _X_COLD
 SProcRRXineramaQueryVersion(ClientPtr client)
 {
     REQUEST(xPanoramiXQueryVersionReq);
@@ -341,7 +341,7 @@ SProcRRXineramaQueryVersion(ClientPtr client)
     return ProcRRXineramaQueryVersion(client);
 }
 
-static int
+static int _X_COLD
 SProcRRXineramaGetState(ClientPtr client)
 {
     REQUEST(xPanoramiXGetStateReq);
@@ -351,7 +351,7 @@ SProcRRXineramaGetState(ClientPtr client)
     return ProcRRXineramaGetState(client);
 }
 
-static int
+static int _X_COLD
 SProcRRXineramaGetScreenCount(ClientPtr client)
 {
     REQUEST(xPanoramiXGetScreenCountReq);
@@ -361,7 +361,7 @@ SProcRRXineramaGetScreenCount(ClientPtr client)
     return ProcRRXineramaGetScreenCount(client);
 }
 
-static int
+static int _X_COLD
 SProcRRXineramaGetScreenSize(ClientPtr client)
 {
     REQUEST(xPanoramiXGetScreenSizeReq);
@@ -372,7 +372,7 @@ SProcRRXineramaGetScreenSize(ClientPtr client)
     return ProcRRXineramaGetScreenSize(client);
 }
 
-static int
+static int _X_COLD
 SProcRRXineramaIsActive(ClientPtr client)
 {
     REQUEST(xXineramaIsActiveReq);
@@ -381,7 +381,7 @@ SProcRRXineramaIsActive(ClientPtr client)
     return ProcRRXineramaIsActive(client);
 }
 
-static int
+static int _X_COLD
 SProcRRXineramaQueryScreens(ClientPtr client)
 {
     REQUEST(xXineramaQueryScreensReq);
diff --git a/record/record.c b/record/record.c
index 82bb060..3e8b497 100644
--- a/record/record.c
+++ b/record/record.c
@@ -2485,7 +2485,7 @@ ProcRecordDispatch(ClientPtr client)
     }
 }                               /* ProcRecordDispatch */
 
-static int
+static int _X_COLD
 SProcRecordQueryVersion(ClientPtr client)
 {
     REQUEST(xRecordQueryVersionReq);
@@ -2497,7 +2497,7 @@ SProcRecordQueryVersion(ClientPtr client)
     return ProcRecordQueryVersion(client);
 }                               /* SProcRecordQueryVersion */
 
-static int
+static int _X_COLD
 SwapCreateRegister(xRecordRegisterClientsReq * stuff)
 {
     int i;
@@ -2521,7 +2521,7 @@ SwapCreateRegister(xRecordRegisterClientsReq * stuff)
     return Success;
 }                               /* SwapCreateRegister */
 
-static int
+static int _X_COLD
 SProcRecordCreateContext(ClientPtr client)
 {
     REQUEST(xRecordCreateContextReq);
@@ -2534,7 +2534,7 @@ SProcRecordCreateContext(ClientPtr client)
     return ProcRecordCreateContext(client);
 }                               /* SProcRecordCreateContext */
 
-static int
+static int _X_COLD
 SProcRecordRegisterClients(ClientPtr client)
 {
     REQUEST(xRecordRegisterClientsReq);
@@ -2547,7 +2547,7 @@ SProcRecordRegisterClients(ClientPtr client)
     return ProcRecordRegisterClients(client);
 }                               /* SProcRecordRegisterClients */
 
-static int
+static int _X_COLD
 SProcRecordUnregisterClients(ClientPtr client)
 {
     REQUEST(xRecordUnregisterClientsReq);
@@ -2560,7 +2560,7 @@ SProcRecordUnregisterClients(ClientPtr client)
     return ProcRecordUnregisterClients(client);
 }                               /* SProcRecordUnregisterClients */
 
-static int
+static int _X_COLD
 SProcRecordGetContext(ClientPtr client)
 {
     REQUEST(xRecordGetContextReq);
@@ -2571,7 +2571,7 @@ SProcRecordGetContext(ClientPtr client)
     return ProcRecordGetContext(client);
 }                               /* SProcRecordGetContext */
 
-static int
+static int _X_COLD
 SProcRecordEnableContext(ClientPtr client)
 {
     REQUEST(xRecordEnableContextReq);
@@ -2582,7 +2582,7 @@ SProcRecordEnableContext(ClientPtr client)
     return ProcRecordEnableContext(client);
 }                               /* SProcRecordEnableContext */
 
-static int
+static int _X_COLD
 SProcRecordDisableContext(ClientPtr client)
 {
     REQUEST(xRecordDisableContextReq);
@@ -2593,7 +2593,7 @@ SProcRecordDisableContext(ClientPtr client)
     return ProcRecordDisableContext(client);
 }                               /* SProcRecordDisableContext */
 
-static int
+static int _X_COLD
 SProcRecordFreeContext(ClientPtr client)
 {
     REQUEST(xRecordFreeContextReq);
@@ -2604,7 +2604,7 @@ SProcRecordFreeContext(ClientPtr client)
     return ProcRecordFreeContext(client);
 }                               /* SProcRecordFreeContext */
 
-static int
+static int _X_COLD
 SProcRecordDispatch(ClientPtr client)
 {
     REQUEST(xReq);
diff --git a/render/render.c b/render/render.c
index b9a932e..8dc1f34 100644
--- a/render/render.c
+++ b/render/render.c
@@ -1978,7 +1978,7 @@ ProcRenderDispatch(ClientPtr client)
         return BadRequest;
 }
 
-static int
+static int _X_COLD
 SProcRenderQueryVersion(ClientPtr client)
 {
     REQUEST(xRenderQueryVersionReq);
@@ -1989,7 +1989,7 @@ SProcRenderQueryVersion(ClientPtr client)
     return (*ProcRenderVector[stuff->renderReqType]) (client);
 }
 
-static int
+static int _X_COLD
 SProcRenderQueryPictFormats(ClientPtr client)
 {
     REQUEST(xRenderQueryPictFormatsReq);
@@ -1998,7 +1998,7 @@ SProcRenderQueryPictFormats(ClientPtr client)
     return (*ProcRenderVector[stuff->renderReqType]) (client);
 }
 
-static int
+static int _X_COLD
 SProcRenderQueryPictIndexValues(ClientPtr client)
 {
     REQUEST(xRenderQueryPictIndexValuesReq);
@@ -2008,13 +2008,13 @@ SProcRenderQueryPictIndexValues(ClientPtr client)
     return (*ProcRenderVector[stuff->renderReqType]) (client);
 }
 
-static int
+static int _X_COLD
 SProcRenderQueryDithers(ClientPtr client)
 {
     return BadImplementation;
 }
 
-static int
+static int _X_COLD
 SProcRenderCreatePicture(ClientPtr client)
 {
     REQUEST(xRenderCreatePictureReq);
@@ -2028,7 +2028,7 @@ SProcRenderCreatePicture(ClientPtr client)
     return (*ProcRenderVector[stuff->renderReqType]) (client);
 }
 
-static int
+static int _X_COLD
 SProcRenderChangePicture(ClientPtr client)
 {
     REQUEST(xRenderChangePictureReq);
@@ -2040,7 +2040,7 @@ SProcRenderChangePicture(ClientPtr client)
     return (*ProcRenderVector[stuff->renderReqType]) (client);
 }
 
-static int
+static int _X_COLD
 SProcRenderSetPictureClipRectangles(ClientPtr client)
 {
     REQUEST(xRenderSetPictureClipRectanglesReq);
@@ -2053,7 +2053,7 @@ SProcRenderSetPictureClipRectangles(ClientPtr client)
     return (*ProcRenderVector[stuff->renderReqType]) (client);
 }
 
-static int
+static int _X_COLD
 SProcRenderFreePicture(ClientPtr client)
 {
     REQUEST(xRenderFreePictureReq);
@@ -2063,7 +2063,7 @@ SProcRenderFreePicture(ClientPtr client)
     return (*ProcRenderVector[stuff->renderReqType]) (client);
 }
 
-static int
+static int _X_COLD
 SProcRenderComposite(ClientPtr client)
 {
     REQUEST(xRenderCompositeReq);
@@ -2083,13 +2083,13 @@ SProcRenderComposite(ClientPtr client)
     return (*ProcRenderVector[stuff->renderReqType]) (client);
 }
 
-static int
+static int _X_COLD
 SProcRenderScale(ClientPtr client)
 {
     return BadImplementation;
 }
 
-static int
+static int _X_COLD
 SProcRenderTrapezoids(ClientPtr client)
 {
     REQUEST(xRenderTrapezoidsReq);
@@ -2105,7 +2105,7 @@ SProcRenderTrapezoids(ClientPtr client)
     return (*ProcRenderVector[stuff->renderReqType]) (client);
 }
 
-static int
+static int _X_COLD
 SProcRenderTriangles(ClientPtr client)
 {
     REQUEST(xRenderTrianglesReq);
@@ -2121,7 +2121,7 @@ SProcRenderTriangles(ClientPtr client)
     return (*ProcRenderVector[stuff->renderReqType]) (client);
 }
 
-static int
+static int _X_COLD
 SProcRenderTriStrip(ClientPtr client)
 {
     REQUEST(xRenderTriStripReq);
@@ -2137,7 +2137,7 @@ SProcRenderTriStrip(ClientPtr client)
     return (*ProcRenderVector[stuff->renderReqType]) (client);
 }
 
-static int
+static int _X_COLD
 SProcRenderTriFan(ClientPtr client)
 {
     REQUEST(xRenderTriFanReq);
@@ -2153,25 +2153,25 @@ SProcRenderTriFan(ClientPtr client)
     return (*ProcRenderVector[stuff->renderReqType]) (client);
 }
 
-static int
+static int _X_COLD
 SProcRenderColorTrapezoids(ClientPtr client)
 {
     return BadImplementation;
 }
 
-static int
+static int _X_COLD
 SProcRenderColorTriangles(ClientPtr client)
 {
     return BadImplementation;
 }
 
-static int
+static int _X_COLD
 SProcRenderTransform(ClientPtr client)
 {
     return BadImplementation;
 }
 
-static int
+static int _X_COLD
 SProcRenderCreateGlyphSet(ClientPtr client)
 {
     REQUEST(xRenderCreateGlyphSetReq);
@@ -2182,7 +2182,7 @@ SProcRenderCreateGlyphSet(ClientPtr client)
     return (*ProcRenderVector[stuff->renderReqType]) (client);
 }
 
-static int
+static int _X_COLD
 SProcRenderReferenceGlyphSet(ClientPtr client)
 {
     REQUEST(xRenderReferenceGlyphSetReq);
@@ -2193,7 +2193,7 @@ SProcRenderReferenceGlyphSet(ClientPtr client)
     return (*ProcRenderVector[stuff->renderReqType]) (client);
 }
 
-static int
+static int _X_COLD
 SProcRenderFreeGlyphSet(ClientPtr client)
 {
     REQUEST(xRenderFreeGlyphSetReq);
@@ -2203,7 +2203,7 @@ SProcRenderFreeGlyphSet(ClientPtr client)
     return (*ProcRenderVector[stuff->renderReqType]) (client);
 }
 
-static int
+static int _X_COLD
 SProcRenderAddGlyphs(ClientPtr client)
 {
     register int i;
@@ -2237,13 +2237,13 @@ SProcRenderAddGlyphs(ClientPtr client)
     return (*ProcRenderVector[stuff->renderReqType]) (client);
 }
 
-static int
+static int _X_COLD
 SProcRenderAddGlyphsFromPicture(ClientPtr client)
 {
     return BadImplementation;
 }
 
-static int
+static int _X_COLD
 SProcRenderFreeGlyphs(ClientPtr client)
 {
     REQUEST(xRenderFreeGlyphsReq);
@@ -2254,7 +2254,7 @@ SProcRenderFreeGlyphs(ClientPtr client)
     return (*ProcRenderVector[stuff->renderReqType]) (client);
 }
 
-static int
+static int _X_COLD
 SProcRenderCompositeGlyphs(ClientPtr client)
 {
     xGlyphElt *elt;
@@ -2326,7 +2326,7 @@ SProcRenderCompositeGlyphs(ClientPtr client)
     return (*ProcRenderVector[stuff->renderReqType]) (client);
 }
 
-static int
+static int _X_COLD
 SProcRenderFillRectangles(ClientPtr client)
 {
     REQUEST(xRenderFillRectanglesReq);
@@ -2342,7 +2342,7 @@ SProcRenderFillRectangles(ClientPtr client)
     return (*ProcRenderVector[stuff->renderReqType]) (client);
 }
 
-static int
+static int _X_COLD
 SProcRenderCreateCursor(ClientPtr client)
 {
     REQUEST(xRenderCreateCursorReq);
@@ -2356,7 +2356,7 @@ SProcRenderCreateCursor(ClientPtr client)
     return (*ProcRenderVector[stuff->renderReqType]) (client);
 }
 
-static int
+static int _X_COLD
 SProcRenderSetPictureTransform(ClientPtr client)
 {
     REQUEST(xRenderSetPictureTransformReq);
@@ -2376,7 +2376,7 @@ SProcRenderSetPictureTransform(ClientPtr client)
     return (*ProcRenderVector[stuff->renderReqType]) (client);
 }
 
-static int
+static int _X_COLD
 SProcRenderQueryFilters(ClientPtr client)
 {
     REQUEST(xRenderQueryFiltersReq);
@@ -2387,7 +2387,7 @@ SProcRenderQueryFilters(ClientPtr client)
     return (*ProcRenderVector[stuff->renderReqType]) (client);
 }
 
-static int
+static int _X_COLD
 SProcRenderSetPictureFilter(ClientPtr client)
 {
     REQUEST(xRenderSetPictureFilterReq);
@@ -2399,7 +2399,7 @@ SProcRenderSetPictureFilter(ClientPtr client)
     return (*ProcRenderVector[stuff->renderReqType]) (client);
 }
 
-static int
+static int _X_COLD
 SProcRenderCreateAnimCursor(ClientPtr client)
 {
     REQUEST(xRenderCreateAnimCursorReq);
@@ -2411,7 +2411,7 @@ SProcRenderCreateAnimCursor(ClientPtr client)
     return (*ProcRenderVector[stuff->renderReqType]) (client);
 }
 
-static int
+static int _X_COLD
 SProcRenderAddTraps(ClientPtr client)
 {
     REQUEST(xRenderAddTrapsReq);
@@ -2425,7 +2425,7 @@ SProcRenderAddTraps(ClientPtr client)
     return (*ProcRenderVector[stuff->renderReqType]) (client);
 }
 
-static int
+static int _X_COLD
 SProcRenderCreateSolidFill(ClientPtr client)
 {
     REQUEST(xRenderCreateSolidFillReq);
@@ -2440,7 +2440,7 @@ SProcRenderCreateSolidFill(ClientPtr client)
     return (*ProcRenderVector[stuff->renderReqType]) (client);
 }
 
-static void
+static void _X_COLD
 swapStops(void *stuff, int num)
 {
     int i;
@@ -2459,7 +2459,7 @@ swapStops(void *stuff, int num)
     }
 }
 
-static int
+static int _X_COLD
 SProcRenderCreateLinearGradient(ClientPtr client)
 {
     int len;
@@ -2486,7 +2486,7 @@ SProcRenderCreateLinearGradient(ClientPtr client)
     return (*ProcRenderVector[stuff->renderReqType]) (client);
 }
 
-static int
+static int _X_COLD
 SProcRenderCreateRadialGradient(ClientPtr client)
 {
     int len;
@@ -2515,7 +2515,7 @@ SProcRenderCreateRadialGradient(ClientPtr client)
     return (*ProcRenderVector[stuff->renderReqType]) (client);
 }
 
-static int
+static int _X_COLD
 SProcRenderCreateConicalGradient(ClientPtr client)
 {
     int len;
@@ -2541,7 +2541,7 @@ SProcRenderCreateConicalGradient(ClientPtr client)
     return (*ProcRenderVector[stuff->renderReqType]) (client);
 }
 
-static int
+static int _X_COLD
 SProcRenderDispatch(ClientPtr client)
 {
     REQUEST(xReq);
diff --git a/xfixes/cursor.c b/xfixes/cursor.c
index f009a78..c1ab3be 100644
--- a/xfixes/cursor.c
+++ b/xfixes/cursor.c
@@ -277,7 +277,7 @@ GetBit(unsigned char *line, int x)
     return 0;
 }
 
-int
+int _X_COLD
 SProcXFixesSelectCursorInput(ClientPtr client)
 {
     REQUEST(xXFixesSelectCursorInputReq);
@@ -288,7 +288,7 @@ SProcXFixesSelectCursorInput(ClientPtr client)
     return (*ProcXFixesVector[stuff->xfixesReqType]) (client);
 }
 
-void
+void _X_COLD
 SXFixesCursorNotifyEvent(xXFixesCursorNotifyEvent * from,
                          xXFixesCursorNotifyEvent * to)
 {
@@ -397,7 +397,7 @@ ProcXFixesGetCursorImage(ClientPtr client)
     return Success;
 }
 
-int
+int _X_COLD
 SProcXFixesGetCursorImage(ClientPtr client)
 {
     REQUEST(xXFixesGetCursorImageReq);
@@ -425,7 +425,7 @@ ProcXFixesSetCursorName(ClientPtr client)
     return Success;
 }
 
-int
+int _X_COLD
 SProcXFixesSetCursorName(ClientPtr client)
 {
     REQUEST(xXFixesSetCursorNameReq);
@@ -474,7 +474,7 @@ ProcXFixesGetCursorName(ClientPtr client)
     return Success;
 }
 
-int
+int _X_COLD
 SProcXFixesGetCursorName(ClientPtr client)
 {
     REQUEST(xXFixesGetCursorNameReq);
@@ -554,7 +554,7 @@ ProcXFixesGetCursorImageAndName(ClientPtr client)
     return Success;
 }
 
-int
+int _X_COLD
 SProcXFixesGetCursorImageAndName(ClientPtr client)
 {
     REQUEST(xXFixesGetCursorImageAndNameReq);
@@ -681,7 +681,7 @@ ProcXFixesChangeCursor(ClientPtr client)
     return Success;
 }
 
-int
+int _X_COLD
 SProcXFixesChangeCursor(ClientPtr client)
 {
     REQUEST(xXFixesChangeCursorReq);
@@ -720,7 +720,7 @@ ProcXFixesChangeCursorByName(ClientPtr client)
     return Success;
 }
 
-int
+int _X_COLD
 SProcXFixesChangeCursorByName(ClientPtr client)
 {
     REQUEST(xXFixesChangeCursorByNameReq);
@@ -880,7 +880,7 @@ ProcXFixesHideCursor(ClientPtr client)
     return ret;
 }
 
-int
+int _X_COLD
 SProcXFixesHideCursor(ClientPtr client)
 {
     REQUEST(xXFixesHideCursorReq);
@@ -931,7 +931,7 @@ ProcXFixesShowCursor(ClientPtr client)
     return Success;
 }
 
-int
+int _X_COLD
 SProcXFixesShowCursor(ClientPtr client)
 {
     REQUEST(xXFixesShowCursorReq);
@@ -1000,7 +1000,7 @@ ProcXFixesCreatePointerBarrier(ClientPtr client)
     return XICreatePointerBarrier(client, stuff);
 }
 
-int
+int _X_COLD
 SProcXFixesCreatePointerBarrier(ClientPtr client)
 {
     REQUEST(xXFixesCreatePointerBarrierReq);
@@ -1035,7 +1035,7 @@ ProcXFixesDestroyPointerBarrier(ClientPtr client)
     return XIDestroyPointerBarrier(client, stuff);
 }
 
-int
+int _X_COLD
 SProcXFixesDestroyPointerBarrier(ClientPtr client)
 {
     REQUEST(xXFixesDestroyPointerBarrierReq);
diff --git a/xfixes/region.c b/xfixes/region.c
index dd74d7f..e773701 100644
--- a/xfixes/region.c
+++ b/xfixes/region.c
@@ -91,7 +91,7 @@ ProcXFixesCreateRegion(ClientPtr client)
     return Success;
 }
 
-int
+int _X_COLD
 SProcXFixesCreateRegion(ClientPtr client)
 {
     REQUEST(xXFixesCreateRegionReq);
@@ -135,7 +135,7 @@ ProcXFixesCreateRegionFromBitmap(ClientPtr client)
     return Success;
 }
 
-int
+int _X_COLD
 SProcXFixesCreateRegionFromBitmap(ClientPtr client)
 {
     REQUEST(xXFixesCreateRegionFromBitmapReq);
@@ -194,7 +194,7 @@ ProcXFixesCreateRegionFromWindow(ClientPtr client)
     return Success;
 }
 
-int
+int _X_COLD
 SProcXFixesCreateRegionFromWindow(ClientPtr client)
 {
     REQUEST(xXFixesCreateRegionFromWindowReq);
@@ -237,7 +237,7 @@ ProcXFixesCreateRegionFromGC(ClientPtr client)
     return Success;
 }
 
-int
+int _X_COLD
 SProcXFixesCreateRegionFromGC(ClientPtr client)
 {
     REQUEST(xXFixesCreateRegionFromGCReq);
@@ -279,7 +279,7 @@ ProcXFixesCreateRegionFromPicture(ClientPtr client)
     return Success;
 }
 
-int
+int _X_COLD
 SProcXFixesCreateRegionFromPicture(ClientPtr client)
 {
     REQUEST(xXFixesCreateRegionFromPictureReq);
@@ -303,7 +303,7 @@ ProcXFixesDestroyRegion(ClientPtr client)
     return Success;
 }
 
-int
+int _X_COLD
 SProcXFixesDestroyRegion(ClientPtr client)
 {
     REQUEST(xXFixesDestroyRegionReq);
@@ -341,7 +341,7 @@ ProcXFixesSetRegion(ClientPtr client)
     return Success;
 }
 
-int
+int _X_COLD
 SProcXFixesSetRegion(ClientPtr client)
 {
     REQUEST(xXFixesSetRegionReq);
@@ -369,7 +369,7 @@ ProcXFixesCopyRegion(ClientPtr client)
     return Success;
 }
 
-int
+int _X_COLD
 SProcXFixesCopyRegion(ClientPtr client)
 {
     REQUEST(xXFixesCopyRegionReq);
@@ -411,7 +411,7 @@ ProcXFixesCombineRegion(ClientPtr client)
     return Success;
 }
 
-int
+int _X_COLD
 SProcXFixesCombineRegion(ClientPtr client)
 {
     REQUEST(xXFixesCombineRegionReq);
@@ -455,7 +455,7 @@ ProcXFixesInvertRegion(ClientPtr client)
     return Success;
 }
 
-int
+int _X_COLD
 SProcXFixesInvertRegion(ClientPtr client)
 {
     REQUEST(xXFixesInvertRegionReq);
@@ -485,7 +485,7 @@ ProcXFixesTranslateRegion(ClientPtr client)
     return Success;
 }
 
-int
+int _X_COLD
 SProcXFixesTranslateRegion(ClientPtr client)
 {
     REQUEST(xXFixesTranslateRegionReq);
@@ -514,7 +514,7 @@ ProcXFixesRegionExtents(ClientPtr client)
     return Success;
 }
 
-int
+int _X_COLD
 SProcXFixesRegionExtents(ClientPtr client)
 {
     REQUEST(xXFixesRegionExtentsReq);
@@ -579,7 +579,7 @@ ProcXFixesFetchRegion(ClientPtr client)
     return Success;
 }
 
-int
+int _X_COLD
 SProcXFixesFetchRegion(ClientPtr client)
 {
     REQUEST(xXFixesFetchRegionReq);
@@ -622,7 +622,7 @@ ProcXFixesSetGCClipRegion(ClientPtr client)
     return Success;
 }
 
-int
+int _X_COLD
 SProcXFixesSetGCClipRegion(ClientPtr client)
 {
     REQUEST(xXFixesSetGCClipRegionReq);
@@ -712,7 +712,7 @@ ProcXFixesSetWindowShapeRegion(ClientPtr client)
     return Success;
 }
 
-int
+int _X_COLD
 SProcXFixesSetWindowShapeRegion(ClientPtr client)
 {
     REQUEST(xXFixesSetWindowShapeRegionReq);
@@ -745,7 +745,7 @@ ProcXFixesSetPictureClipRegion(ClientPtr client)
                                 pRegion);
 }
 
-int
+int _X_COLD
 SProcXFixesSetPictureClipRegion(ClientPtr client)
 {
     REQUEST(xXFixesSetPictureClipRegionReq);
@@ -798,7 +798,7 @@ ProcXFixesExpandRegion(ClientPtr client)
     return Success;
 }
 
-int
+int _X_COLD
 SProcXFixesExpandRegion(ClientPtr client)
 {
     REQUEST(xXFixesExpandRegionReq);
diff --git a/xfixes/saveset.c b/xfixes/saveset.c
index eb3f658..2043153 100644
--- a/xfixes/saveset.c
+++ b/xfixes/saveset.c
@@ -58,7 +58,7 @@ ProcXFixesChangeSaveSet(ClientPtr client)
     return AlterSaveSetForClient(client, pWin, stuff->mode, toRoot, map);
 }
 
-int
+int _X_COLD
 SProcXFixesChangeSaveSet(ClientPtr client)
 {
     REQUEST(xXFixesChangeSaveSetReq);
diff --git a/xfixes/select.c b/xfixes/select.c
index 87a3ad7..19b2c73 100644
--- a/xfixes/select.c
+++ b/xfixes/select.c
@@ -197,7 +197,7 @@ ProcXFixesSelectSelectionInput(ClientPtr client)
                                       pWin, stuff->eventMask);
 }
 
-int
+int _X_COLD
 SProcXFixesSelectSelectionInput(ClientPtr client)
 {
     REQUEST(xXFixesSelectSelectionInputReq);
@@ -210,7 +210,7 @@ SProcXFixesSelectSelectionInput(ClientPtr client)
     return (*ProcXFixesVector[stuff->xfixesReqType]) (client);
 }
 
-void
+void _X_COLD
 SXFixesSelectionNotifyEvent(xXFixesSelectionNotifyEvent * from,
                             xXFixesSelectionNotifyEvent * to)
 {
diff --git a/xfixes/xfixes.c b/xfixes/xfixes.c
index 8d1bd4c..77efd64 100644
--- a/xfixes/xfixes.c
+++ b/xfixes/xfixes.c
@@ -156,7 +156,7 @@ ProcXFixesDispatch(ClientPtr client)
     return (*ProcXFixesVector[stuff->xfixesReqType]) (client);
 }
 
-static int
+static _X_COLD int
 SProcXFixesQueryVersion(ClientPtr client)
 {
     REQUEST(xXFixesQueryVersionReq);
@@ -203,7 +203,7 @@ static int (*SProcXFixesVector[XFixesNumberRequests]) (ClientPtr) = {
 /*************** Version 5 ****************/
 SProcXFixesCreatePointerBarrier, SProcXFixesDestroyPointerBarrier,};
 
-static int
+static _X_COLD int
 SProcXFixesDispatch(ClientPtr client)
 {
     REQUEST(xXFixesReq);
diff --git a/xkb/xkbSwap.c b/xkb/xkbSwap.c
index ecec63e..1c1ed5f 100644
--- a/xkb/xkbSwap.c
+++ b/xkb/xkbSwap.c
@@ -41,7 +41,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
         /*
          * REQUEST SWAPPING
          */
-static int
+static int _X_COLD
 SProcXkbUseExtension(ClientPtr client)
 {
     REQUEST(xkbUseExtensionReq);
@@ -53,7 +53,7 @@ SProcXkbUseExtension(ClientPtr client)
     return ProcXkbUseExtension(client);
 }
 
-static int
+static int _X_COLD
 SProcXkbSelectEvents(ClientPtr client)
 {
     REQUEST(xkbSelectEventsReq);
@@ -131,7 +131,7 @@ SProcXkbSelectEvents(ClientPtr client)
     return ProcXkbSelectEvents(client);
 }
 
-static int
+static int _X_COLD
 SProcXkbBell(ClientPtr client)
 {
     REQUEST(xkbBellReq);
@@ -148,7 +148,7 @@ SProcXkbBell(ClientPtr client)
     return ProcXkbBell(client);
 }
 
-static int
+static int _X_COLD
 SProcXkbGetState(ClientPtr client)
 {
     REQUEST(xkbGetStateReq);
@@ -159,7 +159,7 @@ SProcXkbGetState(ClientPtr client)
     return ProcXkbGetState(client);
 }
 
-static int
+static int _X_COLD
 SProcXkbLatchLockState(ClientPtr client)
 {
     REQUEST(xkbLatchLockStateReq);
@@ -171,7 +171,7 @@ SProcXkbLatchLockState(ClientPtr client)
     return ProcXkbLatchLockState(client);
 }
 
-static int
+static int _X_COLD
 SProcXkbGetControls(ClientPtr client)
 {
     REQUEST(xkbGetControlsReq);
@@ -182,7 +182,7 @@ SProcXkbGetControls(ClientPtr client)
     return ProcXkbGetControls(client);
 }
 
-static int
+static int _X_COLD
 SProcXkbSetControls(ClientPtr client)
 {
     REQUEST(xkbSetControlsReq);
@@ -215,7 +215,7 @@ SProcXkbSetControls(ClientPtr client)
     return ProcXkbSetControls(client);
 }
 
-static int
+static int _X_COLD
 SProcXkbGetMap(ClientPtr client)
 {
     REQUEST(xkbGetMapReq);
@@ -229,7 +229,7 @@ SProcXkbGetMap(ClientPtr client)
     return ProcXkbGetMap(client);
 }
 
-static int
+static int _X_COLD
 SProcXkbSetMap(ClientPtr client)
 {
     REQUEST(xkbSetMapReq);
@@ -245,7 +245,7 @@ SProcXkbSetMap(ClientPtr client)
     return ProcXkbSetMap(client);
 }
 
-static int
+static int _X_COLD
 SProcXkbGetCompatMap(ClientPtr client)
 {
     REQUEST(xkbGetCompatMapReq);
@@ -258,7 +258,7 @@ SProcXkbGetCompatMap(ClientPtr client)
     return ProcXkbGetCompatMap(client);
 }
 
-static int
+static int _X_COLD
 SProcXkbSetCompatMap(ClientPtr client)
 {
     REQUEST(xkbSetCompatMapReq);
@@ -271,7 +271,7 @@ SProcXkbSetCompatMap(ClientPtr client)
     return ProcXkbSetCompatMap(client);
 }
 
-static int
+static int _X_COLD
 SProcXkbGetIndicatorState(ClientPtr client)
 {
     REQUEST(xkbGetIndicatorStateReq);
@@ -282,7 +282,7 @@ SProcXkbGetIndicatorState(ClientPtr client)
     return ProcXkbGetIndicatorState(client);
 }
 
-static int
+static int _X_COLD
 SProcXkbGetIndicatorMap(ClientPtr client)
 {
     REQUEST(xkbGetIndicatorMapReq);
@@ -294,7 +294,7 @@ SProcXkbGetIndicatorMap(ClientPtr client)
     return ProcXkbGetIndicatorMap(client);
 }
 
-static int
+static int _X_COLD
 SProcXkbSetIndicatorMap(ClientPtr client)
 {
     REQUEST(xkbSetIndicatorMapReq);
@@ -306,7 +306,7 @@ SProcXkbSetIndicatorMap(ClientPtr client)
     return ProcXkbSetIndicatorMap(client);
 }
 
-static int
+static int _X_COLD
 SProcXkbGetNamedIndicator(ClientPtr client)
 {
     REQUEST(xkbGetNamedIndicatorReq);
@@ -320,7 +320,7 @@ SProcXkbGetNamedIndicator(ClientPtr client)
     return ProcXkbGetNamedIndicator(client);
 }
 
-static int
+static int _X_COLD
 SProcXkbSetNamedIndicator(ClientPtr client)
 {
     REQUEST(xkbSetNamedIndicatorReq);
@@ -336,7 +336,7 @@ SProcXkbSetNamedIndicator(ClientPtr client)
     return ProcXkbSetNamedIndicator(client);
 }
 
-static int
+static int _X_COLD
 SProcXkbGetNames(ClientPtr client)
 {
     REQUEST(xkbGetNamesReq);
@@ -348,7 +348,7 @@ SProcXkbGetNames(ClientPtr client)
     return ProcXkbGetNames(client);
 }
 
-static int
+static int _X_COLD
 SProcXkbSetNames(ClientPtr client)
 {
     REQUEST(xkbSetNamesReq);
@@ -363,7 +363,7 @@ SProcXkbSetNames(ClientPtr client)
     return ProcXkbSetNames(client);
 }
 
-static int
+static int _X_COLD
 SProcXkbGetGeometry(ClientPtr client)
 {
     REQUEST(xkbGetGeometryReq);
@@ -375,7 +375,7 @@ SProcXkbGetGeometry(ClientPtr client)
     return ProcXkbGetGeometry(client);
 }
 
-static int
+static int _X_COLD
 SProcXkbSetGeometry(ClientPtr client)
 {
     REQUEST(xkbSetGeometryReq);
@@ -393,7 +393,7 @@ SProcXkbSetGeometry(ClientPtr client)
     return ProcXkbSetGeometry(client);
 }
 
-static int
+static int _X_COLD
 SProcXkbPerClientFlags(ClientPtr client)
 {
     REQUEST(xkbPerClientFlagsReq);
@@ -409,7 +409,7 @@ SProcXkbPerClientFlags(ClientPtr client)
     return ProcXkbPerClientFlags(client);
 }
 
-static int
+static int _X_COLD
 SProcXkbListComponents(ClientPtr client)
 {
     REQUEST(xkbListComponentsReq);
@@ -421,7 +421,7 @@ SProcXkbListComponents(ClientPtr client)
     return ProcXkbListComponents(client);
 }
 
-static int
+static int _X_COLD
 SProcXkbGetKbdByName(ClientPtr client)
 {
     REQUEST(xkbGetKbdByNameReq);
@@ -434,7 +434,7 @@ SProcXkbGetKbdByName(ClientPtr client)
     return ProcXkbGetKbdByName(client);
 }
 
-static int
+static int _X_COLD
 SProcXkbGetDeviceInfo(ClientPtr client)
 {
     REQUEST(xkbGetDeviceInfoReq);
@@ -448,7 +448,7 @@ SProcXkbGetDeviceInfo(ClientPtr client)
     return ProcXkbGetDeviceInfo(client);
 }
 
-static int
+static int _X_COLD
 SProcXkbSetDeviceInfo(ClientPtr client)
 {
     REQUEST(xkbSetDeviceInfoReq);
@@ -461,7 +461,7 @@ SProcXkbSetDeviceInfo(ClientPtr client)
     return ProcXkbSetDeviceInfo(client);
 }
 
-static int
+static int _X_COLD
 SProcXkbSetDebuggingFlags(ClientPtr client)
 {
     REQUEST(xkbSetDebuggingFlagsReq);
@@ -476,7 +476,7 @@ SProcXkbSetDebuggingFlags(ClientPtr client)
     return ProcXkbSetDebuggingFlags(client);
 }
 
-int
+int _X_COLD
 SProcXkbDispatch(ClientPtr client)
 {
     REQUEST(xReq);
-- 
2.9.3



More information about the xorg-devel mailing list