[PATCH v2] Fix build without XACE

Julien Cristau jcristau at debian.org
Mon May 17 10:23:44 PDT 2010


dix/colormap.c and dix/gc.c now dereference a ClientPtr, so they need to
include dixstruct.h.  Regression introduced by commit
11c69880c7c48ef9e755c4e09fadef7a629d7bc7.

Reported-by: Robert Hooker <sarvatt at ubuntu.com>
Signed-off-by: Julien Cristau <jcristau at debian.org>
---
Actually tested a full build this time...

 dix/colormap.c |    1 +
 dix/gc.c       |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/dix/colormap.c b/dix/colormap.c
index f75eefe..12197ac 100644
--- a/dix/colormap.c
+++ b/dix/colormap.c
@@ -57,6 +57,7 @@ SOFTWARE.
 #include <strings.h>
 #include "misc.h"
 #include "dix.h"
+#include "dixstruct.h"
 #include "colormapst.h"
 #include "os.h"
 #include "scrnintstr.h"
diff --git a/dix/gc.c b/dix/gc.c
index 5a0d00d..6281f25 100644
--- a/dix/gc.c
+++ b/dix/gc.c
@@ -60,6 +60,7 @@ SOFTWARE.
 #include "dixfontstr.h"
 #include "scrnintstr.h"
 #include "region.h"
+#include "dixstruct.h"
 
 #include "privates.h"
 #include "dix.h"
-- 
1.7.1



More information about the xorg-devel mailing list