[PATCH 2/3] Remove precompiler checks for inline support
Tomas Carnecky
tom at dbservice.com
Fri Mar 20 10:36:55 PDT 2009
The 'inline' keyword is now always available (either supported by
the compiler or defined to nothing by autotools).
Signed-off-by: Tomas Carnecky <tom at dbservice.com>
---
fb/fbpict.h | 9 +--------
render/mipict.c | 6 +-----
2 files changed, 2 insertions(+), 13 deletions(-)
diff --git a/fb/fbpict.h b/fb/fbpict.h
index 0a8082e..a4d3627 100644
--- a/fb/fbpict.h
+++ b/fb/fbpict.h
@@ -30,13 +30,6 @@
#include "renderedge.h"
-
-#if defined(__GNUC__)
-#define INLINE __inline__
-#else
-#define INLINE
-#endif
-
#define FbIntMult(a,b,t) ( (t) = (a) * (b) + 0x80, ( ( ( (t)>>8 ) + (t) )>>8 ) )
#define FbIntDiv(a,b) (((CARD16) (a) * 255) / (b))
@@ -78,7 +71,7 @@
* Returns TRUE if the fbComposeGetSolid can be used to get a single solid
* color representing every source sampling location of the picture.
*/
-static INLINE Bool
+static inline Bool
fbCanGetSolid(PicturePtr pict)
{
if (pict->pDrawable == NULL ||
diff --git a/render/mipict.c b/render/mipict.c
index 777f111..3fc7356 100644
--- a/render/mipict.c
+++ b/render/mipict.c
@@ -33,10 +33,6 @@
#include "picturestr.h"
#include "mipict.h"
-#ifndef __GNUC__
-#define __inline
-#endif
-
int
miCreatePicture (PicturePtr pPicture)
{
@@ -307,7 +303,7 @@ miClipPictureReg (pixman_region16_t * pRegion,
return pixman_region_not_empty(pRegion);
}
-static __inline Bool
+static inline Bool
miClipPictureSrc (RegionPtr pRegion,
PicturePtr pPicture,
int dx,
--
1.6.2
More information about the xorg-devel
mailing list