Xext/security.c

@@ -147,7 +147,7 @@ SecurityLabelInitial(void)
 /*
  * Looks up a request name
  */
-static _X_INLINE const char *
+static inline const char *
 SecurityLookupRequestName(ClientPtr client)
 {
     return LookupRequestName(client->majorOp, client->minorOp);

Xext/sync.c

@@ -60,6 +60,7 @@ PERFORMANCE OF THIS SOFTWARE.
 #include <X11/Xmd.h>
 #include "scrnintstr.h"
 #include "os.h"
+#include "bug.h"
 #include "extnsionst.h"
 #include "dixstruct.h"
 #include "pixmapstr.h"

Xi/exevents.c

@@ -89,6 +89,8 @@ SOFTWARE.
 #include <X11/extensions/XIproto.h>
 #include <X11/extensions/XI2proto.h>
 #include <X11/extensions/geproto.h>
+
+#include "bug.h"
 #include "windowstr.h"
 #include "miscstruct.h"
 #include "region.h"

Xi/xibarriers.c

@@ -45,6 +45,7 @@
 #include <dix-config.h>
 #endif
 
+#include "bug.h"
 #include "xibarriers.h"
 #include "scrnintstr.h"
 #include "cursorstr.h"

config/wscons.c

@@ -25,6 +25,7 @@
 #include <dix-config.h>
 #endif
 
+#include <sys/time.h>
 #include <dev/wscons/wsconsio.h>
 #include <dev/wscons/wsksymdef.h>
 

dix/cursor.c

@@ -50,6 +50,8 @@ SOFTWARE.
 
 #include <X11/X.h>
 #include <X11/Xmd.h>
+
+#include "bug.h"
 #include "servermd.h"
 #include "scrnintstr.h"
 #include "dixstruct.h"

dix/devices.c

@@ -53,6 +53,7 @@ SOFTWARE.
 #include "resource.h"
 #include <X11/Xproto.h>
 #include <X11/Xatom.h>
+#include "bug.h"
 #include "windowstr.h"
 #include "inputstr.h"
 #include "scrnintstr.h"

dix/enterleave.c

@@ -32,6 +32,8 @@
 #include <X11/extensions/XI2.h>
 #include <X11/extensions/XIproto.h>
 #include <X11/extensions/XI2proto.h>
+
+#include "bug.h"
 #include "inputstr.h"
 #include "windowstr.h"
 #include "scrnintstr.h"

dix/events.c

@@ -106,6 +106,8 @@ Equipment Corporation.
 #endif
 
 #include <X11/X.h>
+
+#include "bug.h"
 #include "misc.h"
 #include "resource.h"
 #include <X11/Xproto.h>

dix/gestures.c

@@ -38,6 +38,7 @@
 #include "eventconvert.h"
 #include "windowstr.h"
 #include "mi.h"
+#include "bug.h"
 
 #define GESTURE_HISTORY_SIZE 100
 

dix/getevents.c

@@ -37,6 +37,7 @@
 #include <math.h>
 #include <limits.h>
 
+#include "bug.h"
 #include "misc.h"
 #include "resource.h"
 #include "inputstr.h"

dix/grabs.c

@@ -62,6 +62,7 @@ SOFTWARE.
 #include "exglobals.h"
 #include "inpututils.h"
 #include "client.h"
+#include "bug.h"
 
 #define BITMASK(i) (((Mask)1) << ((i) & 31))
 #define MASKIDX(i) ((i) >> 5)

dix/inpututils.c

@@ -27,6 +27,7 @@
 #include "dix-config.h"
 #endif
 
+#include "bug.h"
 #include "exevents.h"
 #include "exglobals.h"
 #include "misc.h"

dix/ptrveloc.c

@@ -31,6 +31,7 @@
 #include <exevents.h>
 #include <X11/Xatom.h>
 #include <os.h>
+#include "bug.h"
 
 #include <xserver-properties.h>
 

dix/region.c

@@ -402,7 +402,7 @@ RegionRectAlloc(RegionPtr pRgn, int n)
  *
  *-----------------------------------------------------------------------
  */
-_X_INLINE static int
+static inline int
 RegionCoalesce(RegionPtr pReg,  /* Region to coalesce                */
                int prevStart,   /* Index of start of previous band   */
                int curStart)
@@ -487,7 +487,7 @@ RegionCoalesce(RegionPtr pReg,  /* Region to coalesce                */
  *-----------------------------------------------------------------------
  */
 
-_X_INLINE static Bool
+static inline Bool
 RegionAppendNonO(RegionPtr pReg, BoxPtr r, BoxPtr rEnd, int y1, int y2)
 {
     BoxPtr pNextRect;

dix/resource.c

@@ -493,7 +493,7 @@ static const struct ResourceType predefTypes[] = {
 
 CallbackListPtr ResourceStateCallback;
 
-static _X_INLINE void
+static inline void
 CallResourceStateCallback(ResourceState state, ResourceRec * res)
 {
     if (ResourceStateCallback) {

dix/selection.c

@@ -101,7 +101,7 @@ InitSelections(void)
     CurrentSelections = NULL;
 }
 
-static _X_INLINE void
+static inline void
 CallSelectionCallback(Selection * pSel, ClientPtr client,
                       SelectionCallbackKind kind)
 {

dix/touch.c

@@ -39,6 +39,7 @@
 #include "eventconvert.h"
 #include "windowstr.h"
 #include "mi.h"
+#include "bug.h"
 
 #define TOUCH_HISTORY_SIZE 100
 

dri3/dri3_request.c

@@ -27,6 +27,7 @@
 #include "../Xext/syncsdk.h"
 #include <protocol-versions.h>
 #include <drm_fourcc.h>
+#include "randrstr_priv.h"
 
 static Bool
 dri3_screen_can_one_point_two(ScreenPtr screen)

exa/exa_classic.c

@@ -33,7 +33,7 @@
 
 /* This file holds the classic exa specific implementation. */
 
-static _X_INLINE void *
+static inline void *
 ExaGetPixmapAddress(PixmapPtr p)
 {
     ExaPixmapPriv(p);