diff options
| author | marha <marha@users.sourceforge.net> | 2010-04-22 13:02:12 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-04-22 13:02:12 +0000 |
| commit | 2446c474aae15bcaf31e4b799f94f21d515984d5 (patch) | |
| tree | 31c649543787afa72f5908dedf07ec8ae37a84a2 /xorg-server/hw/xfree86/modes | |
| parent | 0b44ee3fb92120190fa46e73b7abfbaa8a0adaec (diff) | |
| download | vcxsrv-2446c474aae15bcaf31e4b799f94f21d515984d5.tar.gz vcxsrv-2446c474aae15bcaf31e4b799f94f21d515984d5.tar.bz2 vcxsrv-2446c474aae15bcaf31e4b799f94f21d515984d5.zip | |
svn merge -r541:HEAD "^/branches/released" .
Diffstat (limited to 'xorg-server/hw/xfree86/modes')
| -rw-r--r-- | xorg-server/hw/xfree86/modes/xf86Crtc.c | 4 | ||||
| -rw-r--r-- | xorg-server/hw/xfree86/modes/xf86Cursors.c | 2 |
2 files changed, 0 insertions, 6 deletions
diff --git a/xorg-server/hw/xfree86/modes/xf86Crtc.c b/xorg-server/hw/xfree86/modes/xf86Crtc.c index 860e520ad..1ccaffc10 100644 --- a/xorg-server/hw/xfree86/modes/xf86Crtc.c +++ b/xorg-server/hw/xfree86/modes/xf86Crtc.c @@ -42,9 +42,7 @@ #include "X11/extensions/render.h" #include "X11/extensions/dpmsconst.h" #include "X11/Xatom.h" -#ifdef RENDER #include "picturestr.h" -#endif #include "xf86xv.h" @@ -184,7 +182,6 @@ xf86CrtcInUse (xf86CrtcPtr crtc) void xf86CrtcSetScreenSubpixelOrder (ScreenPtr pScreen) { -#ifdef RENDER int subpixel_order = SubPixelUnknown; Bool has_none = FALSE; ScrnInfoPtr scrn = xf86Screens[pScreen->myNum]; @@ -243,7 +240,6 @@ xf86CrtcSetScreenSubpixelOrder (ScreenPtr pScreen) if (subpixel_order == SubPixelUnknown && has_none) subpixel_order = SubPixelNone; PictureSetSubpixelOrder (pScreen, subpixel_order); -#endif } /** diff --git a/xorg-server/hw/xfree86/modes/xf86Cursors.c b/xorg-server/hw/xfree86/modes/xf86Cursors.c index e2e174e59..f90ecc227 100644 --- a/xorg-server/hw/xfree86/modes/xf86Cursors.c +++ b/xorg-server/hw/xfree86/modes/xf86Cursors.c @@ -41,9 +41,7 @@ #include "X11/extensions/render.h" #include "X11/extensions/dpmsconst.h" #include "X11/Xatom.h" -#ifdef RENDER #include "picturestr.h" -#endif #include "cursorstr.h" #include "inputstr.h" |