replace _X_INLINE by inline in internal static functions
Since xserver is compiled as C99, we just can use the `inline` keyword. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
parent
f0a187f55d
commit
b3b86ae674
|
@ -147,7 +147,7 @@ SecurityLabelInitial(void)
|
||||||
/*
|
/*
|
||||||
* Looks up a request name
|
* Looks up a request name
|
||||||
*/
|
*/
|
||||||
static _X_INLINE const char *
|
static inline const char *
|
||||||
SecurityLookupRequestName(ClientPtr client)
|
SecurityLookupRequestName(ClientPtr client)
|
||||||
{
|
{
|
||||||
return LookupRequestName(client->majorOp, client->minorOp);
|
return LookupRequestName(client->majorOp, client->minorOp);
|
||||||
|
|
|
@ -402,7 +402,7 @@ RegionRectAlloc(RegionPtr pRgn, int n)
|
||||||
*
|
*
|
||||||
*-----------------------------------------------------------------------
|
*-----------------------------------------------------------------------
|
||||||
*/
|
*/
|
||||||
_X_INLINE static int
|
static inline int
|
||||||
RegionCoalesce(RegionPtr pReg, /* Region to coalesce */
|
RegionCoalesce(RegionPtr pReg, /* Region to coalesce */
|
||||||
int prevStart, /* Index of start of previous band */
|
int prevStart, /* Index of start of previous band */
|
||||||
int curStart)
|
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)
|
RegionAppendNonO(RegionPtr pReg, BoxPtr r, BoxPtr rEnd, int y1, int y2)
|
||||||
{
|
{
|
||||||
BoxPtr pNextRect;
|
BoxPtr pNextRect;
|
||||||
|
|
|
@ -493,7 +493,7 @@ static const struct ResourceType predefTypes[] = {
|
||||||
|
|
||||||
CallbackListPtr ResourceStateCallback;
|
CallbackListPtr ResourceStateCallback;
|
||||||
|
|
||||||
static _X_INLINE void
|
static inline void
|
||||||
CallResourceStateCallback(ResourceState state, ResourceRec * res)
|
CallResourceStateCallback(ResourceState state, ResourceRec * res)
|
||||||
{
|
{
|
||||||
if (ResourceStateCallback) {
|
if (ResourceStateCallback) {
|
||||||
|
|
|
@ -101,7 +101,7 @@ InitSelections(void)
|
||||||
CurrentSelections = NULL;
|
CurrentSelections = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
static _X_INLINE void
|
static inline void
|
||||||
CallSelectionCallback(Selection * pSel, ClientPtr client,
|
CallSelectionCallback(Selection * pSel, ClientPtr client,
|
||||||
SelectionCallbackKind kind)
|
SelectionCallbackKind kind)
|
||||||
{
|
{
|
||||||
|
|
|
@ -33,7 +33,7 @@
|
||||||
|
|
||||||
/* This file holds the classic exa specific implementation. */
|
/* This file holds the classic exa specific implementation. */
|
||||||
|
|
||||||
static _X_INLINE void *
|
static inline void *
|
||||||
ExaGetPixmapAddress(PixmapPtr p)
|
ExaGetPixmapAddress(PixmapPtr p)
|
||||||
{
|
{
|
||||||
ExaPixmapPriv(p);
|
ExaPixmapPriv(p);
|
||||||
|
|
|
@ -33,7 +33,7 @@
|
||||||
|
|
||||||
/* This file holds the driver allocated pixmaps specific implementation. */
|
/* This file holds the driver allocated pixmaps specific implementation. */
|
||||||
|
|
||||||
static _X_INLINE void *
|
static inline void *
|
||||||
ExaGetPixmapAddress(PixmapPtr p)
|
ExaGetPixmapAddress(PixmapPtr p)
|
||||||
{
|
{
|
||||||
ExaPixmapPriv(p);
|
ExaPixmapPriv(p);
|
||||||
|
|
|
@ -34,7 +34,7 @@
|
||||||
/* This file holds the driver allocated pixmaps + better initial placement code.
|
/* This file holds the driver allocated pixmaps + better initial placement code.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
static _X_INLINE void *
|
static inline void *
|
||||||
ExaGetPixmapAddress(PixmapPtr p)
|
ExaGetPixmapAddress(PixmapPtr p)
|
||||||
{
|
{
|
||||||
ExaPixmapPriv(p);
|
ExaPixmapPriv(p);
|
||||||
|
|
|
@ -452,7 +452,7 @@ ExaCheckAddTraps(PicturePtr pPicture,
|
||||||
|
|
||||||
/* exa_accel.c */
|
/* exa_accel.c */
|
||||||
|
|
||||||
static _X_INLINE Bool
|
static inline Bool
|
||||||
exaGCReadsDestination(DrawablePtr pDrawable, unsigned long planemask,
|
exaGCReadsDestination(DrawablePtr pDrawable, unsigned long planemask,
|
||||||
unsigned int fillStyle, unsigned char alu,
|
unsigned int fillStyle, unsigned char alu,
|
||||||
Bool clientClip)
|
Bool clientClip)
|
||||||
|
|
Loading…
Reference in New Issue