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 /randr | |
| 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 'randr')
| -rw-r--r-- | randr/randrstr.h | 2 | ||||
| -rw-r--r-- | randr/rrinfo.c | 2 | ||||
| -rw-r--r-- | randr/rrscreen.c | 4 |
3 files changed, 0 insertions, 8 deletions
diff --git a/randr/randrstr.h b/randr/randrstr.h index 975fe3396..b163a73da 100644 --- a/randr/randrstr.h +++ b/randr/randrstr.h @@ -47,10 +47,8 @@ #include "rrtransform.h" #include <X11/extensions/randr.h> #include <X11/extensions/randrproto.h> -#ifdef RENDER #include <X11/extensions/render.h> /* we share subpixel order information */ #include "picturestr.h" -#endif #include <X11/Xfuncproto.h> /* required for ABI compatibility for now */ diff --git a/randr/rrinfo.c b/randr/rrinfo.c index 12b9a4aab..20066d5fc 100644 --- a/randr/rrinfo.c +++ b/randr/rrinfo.c @@ -99,9 +99,7 @@ RRScanOldConfig (ScreenPtr pScreen, Rotation rotations) return; RROutputSetCrtcs (output, &crtc, 1); RROutputSetConnection (output, RR_Connected); -#ifdef RENDER RROutputSetSubpixelOrder (output, PictureGetSubpixelOrder (pScreen)); -#endif } output = pScrPriv->outputs[0]; diff --git a/randr/rrscreen.c b/randr/rrscreen.c index 630ff5742..26de1e2e2 100644 --- a/randr/rrscreen.c +++ b/randr/rrscreen.c @@ -106,11 +106,7 @@ RRDeliverScreenEvent (ClientPtr client, WindowPtr pWin, ScreenPtr pScreen) se.configTimestamp = pScrPriv->lastConfigTime.milliseconds; se.root = pRoot->drawable.id; se.window = pWin->drawable.id; -#ifdef RENDER se.subpixelOrder = PictureGetSubpixelOrder (pScreen); -#else - se.subpixelOrder = SubPixelUnknown; -#endif se.sequenceNumber = client->sequence; se.sizeID = RR10CurrentSizeID (pScreen); |