diff options
| author | Adam Jackson <ajax@benzedrine.nwnk.net> | 2007-05-09 18:57:05 -0400 |
|---|---|---|
| committer | Adam Jackson <ajax@benzedrine.nwnk.net> | 2007-05-11 11:43:19 -0400 |
| commit | 8dcc37520d5e8c8b52cee81faa67fd5205548377 (patch) | |
| tree | b3837581a08a45b6988d6352fa589ef9efc993ac /mi | |
| parent | 6ff239cb4e67c0a2ea497a1714e5585c1d941af3 (diff) | |
Use _X_INLINE instead of ad-hoc #defines.
Diffstat (limited to 'mi')
| -rw-r--r-- | mi/miarc.c | 25 | ||||
| -rw-r--r-- | mi/miregion.c | 11 |
2 files changed, 5 insertions, 31 deletions
diff --git a/mi/miarc.c b/mi/miarc.c index 17b7891bf..69c5acdbc 100644 --- a/mi/miarc.c +++ b/mi/miarc.c @@ -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) -{ - return x>y? x:y; -} - -inline static int min (const int x, const int y) -{ - return x<y? x:y; -} - -#else - -static int -max (int x, int y) +_X_INLINE static int max (const int x, const int y) { return x>y? x:y; } -static int -min (int x, int y) +_X_INLINE static int min (const int x, const int y) { return x<y? x:y; } -#endif - struct bound { double min, max; }; diff --git a/mi/miregion.c b/mi/miregion.c index e980ad18e..0eab6623a 100644 --- a/mi/miregion.c +++ b/mi/miregion.c @@ -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, |