summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2007-08-22 09:00:45 -0700
committerEric Anholt <eric@anholt.net>2007-08-22 09:00:45 -0700
commitd0dc9698ae4324d44ed4c0482d6858d0b73bff33 (patch)
tree5522dd0a306613fd7675252a6646869a4d344e20
parentbc2d516f16d94c805b4dfa8e5b9eef40ff0cbe98 (diff)
Revert "Fix <pixman.h> include to <pixman/pixman.h>"
The pixman headers have been located under pixman-1/ instead of pixman/ since around 2007-08-06, and pixman-1.pc has the updated include paths to account for this. This reverts commit feb1b3e45513bd6eaa2e6a5ee536183f20d9cb68.
-rw-r--r--fb/fb.h2
-rw-r--r--include/miscstruct.h2
-rw-r--r--mi/miregion.c2
-rw-r--r--render/picture.h2
4 files changed, 4 insertions, 4 deletions
diff --git a/fb/fb.h b/fb/fb.h
index 27b49f681..df430b8fd 100644
--- a/fb/fb.h
+++ b/fb/fb.h
@@ -26,7 +26,7 @@
#define _FB_H_
#include <X11/X.h>
-#include <pixman/pixman.h>
+#include <pixman.h>
#include "scrnintstr.h"
#include "pixmap.h"
diff --git a/include/miscstruct.h b/include/miscstruct.h
index 4f5b1d516..d240f1b28 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/pixman.h>
+#include <pixman.h>
typedef xPoint DDXPointRec;
diff --git a/mi/miregion.c b/mi/miregion.c
index 28d38a254..45768a34f 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/pixman.h>
+#include <pixman.h>
#undef assert
#ifdef DEBUG
diff --git a/render/picture.h b/render/picture.h
index 1719587a5..563a81b43 100644
--- a/render/picture.h
+++ b/render/picture.h
@@ -25,7 +25,7 @@
#ifndef _PICTURE_H_
#define _PICTURE_H_
-#include <pixman/pixman.h>
+#include <pixman.h>
typedef struct _DirectFormat *DirectFormatPtr;
typedef struct _PictFormat *PictFormatPtr;