From 27cec0a0501369a68031c048e691bda4c7095f72 Mon Sep 17 00:00:00 2001
From: Julien Cristau <jcristau@debian.org>
Date: Mon, 17 May 2010 19:23:44 +0200
Subject: [PATCH] Fix build without XACE

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@ubuntu.com>
Signed-off-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
---
 dix/colormap.c | 1 +
 dix/gc.c       | 1 +
 2 files changed, 2 insertions(+)

diff --git a/dix/colormap.c b/dix/colormap.c
index f75eefe14..12197acde 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 5a0d00d5a..6281f25cd 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"