aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/fb/fbtrap.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-04-22 13:02:12 +0000
committermarha <marha@users.sourceforge.net>2010-04-22 13:02:12 +0000
commit2446c474aae15bcaf31e4b799f94f21d515984d5 (patch)
tree31c649543787afa72f5908dedf07ec8ae37a84a2 /xorg-server/fb/fbtrap.c
parent0b44ee3fb92120190fa46e73b7abfbaa8a0adaec (diff)
downloadvcxsrv-2446c474aae15bcaf31e4b799f94f21d515984d5.tar.gz
vcxsrv-2446c474aae15bcaf31e4b799f94f21d515984d5.tar.bz2
vcxsrv-2446c474aae15bcaf31e4b799f94f21d515984d5.zip
svn merge -r541:HEAD "^/branches/released" .
Diffstat (limited to 'xorg-server/fb/fbtrap.c')
-rw-r--r--xorg-server/fb/fbtrap.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/xorg-server/fb/fbtrap.c b/xorg-server/fb/fbtrap.c
index 515e2e1c1..9f5c39f65 100644
--- a/xorg-server/fb/fbtrap.c
+++ b/xorg-server/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 */