andreacavalli
/
xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use _X_INLINE instead of ad-hoc #defines.

This commit is contained in:
Adam Jackson 2007-05-09 18:57:05 -04:00
parent 6ff239cb4e
commit 8dcc37520d
2 changed files with 5 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
mi/miarc.c
View File

@ -100,37 +100,16 @@ double cbrt(double);
#undef max
#undef min
#if defined (__GNUC__) && !defined (__STRICT_ANSI__)
#define USE_INLINE
#endif
#ifdef USE_INLINE
inline static int max (const int x, const int y)
_X_INLINE static int max (const int x, const int y)
{
return x>y? x:y;
}
inline static int min (const int x, const int y)
_X_INLINE static int min (const int x, const int y)
{
return x<y? x:y;
}
#else
static int
max (int x, int y)
{
return x>y? x:y;
}
static int
min (int x, int y)
{
return x<y? x:y;
}
#endif
struct bound {
double min, max;
};

11
mi/miregion.c
View File

@ -81,16 +81,11 @@ Equipment Corporation.
#include "regionstr.h"
#include <X11/Xprotostr.h>
#include <X11/Xfuncproto.h>
#include "gc.h"
#include "mi.h"
#include "mispans.h"
#if defined (__GNUC__) && !defined (NO_INLINES)
#define INLINE __inline
#else
#define INLINE
#endif
#undef assert
#ifdef DEBUG
#define assert(expr) {if (!(expr)) \
@ -506,7 +501,7 @@ miRegionCopy(dst, src)
*
*-----------------------------------------------------------------------
*/
INLINE static int
_X_INLINE static int
miCoalesce (
RegionPtr pReg, /* Region to coalesce */
int prevStart, /* Index of start of previous band */
@ -590,7 +585,7 @@ miCoalesce (
*-----------------------------------------------------------------------
*/
INLINE static Bool
_X_INLINE static Bool
miAppendNonO (
RegionPtr pReg,
BoxPtr r,