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/xf86Cursors.c | |
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/xf86Cursors.c')
-rw-r--r-- | xorg-server/hw/xfree86/modes/xf86Cursors.c | 2 |
1 files changed, 0 insertions, 2 deletions
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" |