xserver: Branch 'master'

[Alan Hourihane]

 fb/fb.h              |    2 +-
 include/miscstruct.h |    2 +-
 mi/miregion.c        |    2 +-
 render/picture.h     |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

New commits:
diff-tree feb1b3e45513bd6eaa2e6a5ee536183f20d9cb68 (from b6a7c0112c42a3287e53647c38b2c0c5bf8fefa0)
Author: Alan Hourihane <alanh at fairlite.demon.co.uk>
Date:   Wed Aug 22 16:54:29 2007 +0100

    Fix <pixman.h> include to <pixman/pixman.h>

diff --git a/fb/fb.h b/fb/fb.h
index df430b8..27b49f6 100644
--- a/fb/fb.h
+++ b/fb/fb.h
@@ -26,7 +26,7 @@
 #define _FB_H_
 
 #include <X11/X.h>
-#include <pixman.h>
+#include <pixman/pixman.h>
 
 #include "scrnintstr.h"
 #include "pixmap.h"
diff --git a/include/miscstruct.h b/include/miscstruct.h
index d240f1b..4f5b1d5 100644
--- a/include/miscstruct.h
+++ b/include/miscstruct.h
@@ -51,7 +51,7 @@ SOFTWARE.
 #include "misc.h"
 #include <X11/Xprotostr.h>
 #include "gc.h"
-#include <pixman.h>
+#include <pixman/pixman.h>
 
 typedef xPoint DDXPointRec;
 
diff --git a/mi/miregion.c b/mi/miregion.c
index 45768a3..28d38a2 100644
--- a/mi/miregion.c
+++ b/mi/miregion.c
@@ -85,7 +85,7 @@ Equipment Corporation.
 #include "gc.h"
 #include "mi.h"
 #include "mispans.h"
-#include <pixman.h>
+#include <pixman/pixman.h>
 
 #undef assert
 #ifdef DEBUG
diff --git a/render/picture.h b/render/picture.h
index 563a81b..1719587 100644
--- a/render/picture.h
+++ b/render/picture.h
@@ -25,7 +25,7 @@
 #ifndef _PICTURE_H_
 #define _PICTURE_H_
 
-#include <pixman.h>
+#include <pixman/pixman.h>
 
 typedef struct _DirectFormat	*DirectFormatPtr;
 typedef struct _PictFormat	*PictFormatPtr;