dispatch: Mark swapped dispatch as _X_COLD

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@redhat.com>
Reviewed-by: Eric Anholt <eric@anholt.net>

17 files changed, 151 insertions, 151 deletions

diff --git a/Xext/dpms.c b/Xext/dpms.c
index cdfaa9724..4b620d58c 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 6312f248b..08dff280b 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 b6ff6f918..022defdc7 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 750b8b965..bf3a23d9a 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 8cb3a2c73..162d07ae0 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 142f9c178..e7c7a45b0 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 1b622e353..91ea90b14 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 63350685c..4c4835929 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 ea3ad1320..8ba919a3c 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 ed25650cd..c3c0b7f43 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 f2584c221..72bb77401 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 ae779dfe8..21239f588 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 fb7b2d526..6325634be 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 2371a69e1..38b80122b 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 8a35b7b4e..d99d3d49d 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 c9b11d4bb..c520c7d29 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 7565c173d..c7338b766 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 */