xserver: Branch 'master'
Benjamin Herrenschmidt
benh at kemper.freedesktop.org
Sat Jun 2 16:44:34 PDT 2007
fb/fb.h | 2 ++
fb/fbpict.c | 1 -
fb/fbtrap.c | 2 --
3 files changed, 2 insertions(+), 3 deletions(-)
New commits:
diff-tree e5ce982381c4092252d6b55fcefcc9a3cd21e656 (from 90eb22656c34d2d08a8dccaf05e6d081c56bd7f3)
Author: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Date: Sun Jun 3 09:40:37 2007 +1000
Include pixman.h from fb.h or compile of some files will fail
Signed-off-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
diff --git a/fb/fb.h b/fb/fb.h
index 7d94886..655d5ae 100644
--- a/fb/fb.h
+++ b/fb/fb.h
@@ -26,6 +26,8 @@
#define _FB_H_
#include <X11/X.h>
+#include <pixman/pixman.h>
+
#include "scrnintstr.h"
#include "pixmap.h"
#include "pixmapstr.h"
diff --git a/fb/fbpict.c b/fb/fbpict.c
index 00dde61..68c0e63 100644
--- a/fb/fbpict.c
+++ b/fb/fbpict.c
@@ -30,7 +30,6 @@
#include <string.h>
#include "fb.h"
-#include <pixman/pixman.h>
#ifdef RENDER
diff --git a/fb/fbtrap.c b/fb/fbtrap.c
index 07b4fbb..8313068 100644
--- a/fb/fbtrap.c
+++ b/fb/fbtrap.c
@@ -30,8 +30,6 @@
#ifdef RENDER
-#include <pixman/pixman.h>
-
#include "picturestr.h"
#include "mipict.h"
#include "renderedge.h"
More information about the xorg-commit
mailing list