[PATCH] Fix build without XACE

[Robert Hooker]

On Mon, May 17, 2010 at 12:25 PM, Julien Cristau <jcristau at debian.org> wrote:
> dix/colormap.c now dereferences a ClientPtr, so it needs 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>
> ---
>  dix/colormap.c |    1 +
>  1 files changed, 1 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"
> --
> 1.7.1
>
> _______________________________________________
> xorg-devel at lists.x.org: X.Org development
> Archives: http://lists.x.org/archives/xorg-devel
> Info: http://lists.x.org/mailman/listinfo/xorg-devel
>

With this change colormap builds and this patch works, but with the
same configure flags it still fails later at this:

 CC     gc.lo
../../dix/gc.c: In function 'ChangeGC':
../../dix/gc.c:152: error: dereferencing pointer to incomplete type
../../dix/gc.c:186: error: dereferencing pointer to incomplete type
../../dix/gc.c:200: error: dereferencing pointer to incomplete type
../../dix/gc.c:214: error: dereferencing pointer to incomplete type
../../dix/gc.c:228: error: dereferencing pointer to incomplete type
../../dix/gc.c:242: error: dereferencing pointer to incomplete type
../../dix/gc.c:303: error: dereferencing pointer to incomplete type
../../dix/gc.c:317: error: dereferencing pointer to incomplete type
../../dix/gc.c:379: error: dereferencing pointer to incomplete type
../../dix/gc.c:393: error: dereferencing pointer to incomplete type
../../dix/gc.c:400: error: dereferencing pointer to incomplete type
../../dix/gc.c: In function 'ChangeGCXIDs':
../../dix/gc.c:439: error: dereferencing pointer to incomplete type
../../dix/gc.c:459: error: dereferencing pointer to incomplete type
make[3]: *** [gc.lo] Error 1


Configure flags for the specific build target that fails:

       ../configure \
         --prefix=/usr \
         --mandir=\${prefix}/share/man \
         --infodir=\${prefix}/share/info \
         --sysconfdir=/etc \
         --localstatedir=/var \
         --build=i486-linux-gnu --disable-static --without-dtrace
--disable-strict-compilation --disable-debug --enable-unit-tests
--with-int10=x86emu
--with-extra-module-dir="/usr/lib/xorg/extra-modules"
--with-os-vendor="Ubuntu" --with-builderstring="xorg-server
2:1.8.99.0+git20100517.345eb171-0ubuntu0sarvatt3 (Robert Hooker
<sarvatt at ubuntu.com>)" --with-xkb-path=/usr/share/X11/xkb
--with-xkb-output=/var/lib/xkb --disable-builddocs
--disable-install-libxf86config --enable-mitshm --enable-xres
--disable-xcalibrate --disable-tslib --disable-multibuffer
--enable-dbe --disable-xf86bigfont --enable-dpms --disable-config-dbus
--enable-config-udev --disable-config-hal --enable-xorg
--disable-xquartz --disable-xwin --disable-xfake
--disable-install-setuid \
         --with-default-font-path="built-ins" --disable-aiglx
--disable-glx-tls --disable-registry --disable-composite
--disable-record --disable-xv --disable-xvmc --enable-dga
--disable-screensaver --disable-xcsecurity --disable-xdmcp
--disable-xdm-auth-1 --disable-glx --disable-dri --disable-dri2
--disable-xinerama --disable-xf86vidmode --disable-xace
--disable-xselinux --disable-xfree86-utils --disable-dmx
--disable-xvfb --disable-xnest --disable-kdrive --disable-xephyr
--disable-xfbdev --with-sha1=nettle  \
         CFLAGS="-Wall -g -O2" \
         CPPFLAGS=" -DPRE_RELEASE=0"


Tested-by: Robert Hooker <sarvatt at ubuntu.com>