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/fb/fb.h | |
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/fb/fb.h')
-rw-r--r-- | xorg-server/fb/fb.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/xorg-server/fb/fb.h b/xorg-server/fb/fb.h index 02d6c0372..91c91eeb2 100644 --- a/xorg-server/fb/fb.h +++ b/xorg-server/fb/fb.h @@ -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 |