diff options
| author | Keith Packard <keithp@keithp.com> | 2010-04-19 09:26:10 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2010-04-19 09:26:10 -0700 |
| commit | 28b7b2b8d02d975480080865f0dddebcaa2f7968 (patch) | |
| tree | 275bb660082403874d882e8cbc34841efb0a0435 /fb | |
| parent | b3ab978df861c08298f57529e3db980489055c35 (diff) | |
unifdef -B -DRENDER to always include RENDER code
This patch was created with:
git ls-files '*.[ch]' | while read f; do unifdef -B -DRENDER -o $f $f; done
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'fb')
| -rw-r--r-- | fb/fb.h | 4 | ||||
| -rw-r--r-- | fb/fbpict.c | 8 | ||||
| -rw-r--r-- | fb/fbtrap.c | 3 |
3 files changed, 0 insertions, 15 deletions
@@ -41,11 +41,7 @@ #include "mi.h" #include "migc.h" #include "mibstore.h" -#ifdef RENDER #include "picturestr.h" -#else -#include "picture.h" -#endif #ifdef FB_ACCESS_WRAPPER diff --git a/fb/fbpict.c b/fb/fbpict.c index dddfce87f..896d33ebb 100644 --- a/fb/fbpict.c +++ b/fb/fbpict.c @@ -31,8 +31,6 @@ #include "fb.h" -#ifdef RENDER - #include "picturestr.h" #include "mipict.h" #include "fbpict.h" @@ -203,8 +201,6 @@ fbCompositeGeneral (CARD8 op, width, height); } -#endif /* RENDER */ - static pixman_image_t * create_solid_fill_image (PicturePtr pict) { @@ -472,8 +468,6 @@ Bool fbPictureInit (ScreenPtr pScreen, PictFormatPtr formats, int nformats) { -#ifdef RENDER - PictureScreenPtr ps; if (!miPictureInit (pScreen, formats, nformats)) @@ -486,7 +480,5 @@ fbPictureInit (ScreenPtr pScreen, PictFormatPtr formats, int nformats) ps->AddTraps = fbAddTraps; ps->AddTriangles = fbAddTriangles; -#endif /* RENDER */ - return TRUE; } diff --git a/fb/fbtrap.c b/fb/fbtrap.c index 515e2e1c1..9f5c39f65 100644 --- a/fb/fbtrap.c +++ b/fb/fbtrap.c @@ -26,8 +26,6 @@ #include "fb.h" -#ifdef RENDER - #include "picturestr.h" #include "mipict.h" #include "renderedge.h" @@ -160,4 +158,3 @@ fbAddTriangles (PicturePtr pPicture, } } -#endif /* RENDER */ |