diff options
| author | Julien Cristau <jcristau@debian.org> | 2008-10-26 11:20:33 +0100 |
|---|---|---|
| committer | Julien Cristau <jcristau@debian.org> | 2008-10-26 11:44:57 +0100 |
| commit | eadf90aa65d1ea63ddcd74e60e66a79ad567c7e8 (patch) | |
| tree | f7a4781c682f65f842e595305736a0e0a8c278ce | |
| parent | aee514cfb5e5a59b7770699765ccdad8fe42f904 (diff) | |
xaa: Fix compiler warning (implicit declaration)
xaaInit.c: In function 'XAAInit':
xaaInit.c:201: warning: implicit declaration of function 'miInitializeCompositeWrapper'
xaaInit.c:201: warning: nested extern declaration of 'miInitializeCompositeWrapper'
| -rw-r--r-- | hw/xfree86/xaa/Makefile.am | 2 | ||||
| -rw-r--r-- | hw/xfree86/xaa/xaaInit.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/hw/xfree86/xaa/Makefile.am b/hw/xfree86/xaa/Makefile.am index c409eb7e5..e9f5e687c 100644 --- a/hw/xfree86/xaa/Makefile.am +++ b/hw/xfree86/xaa/Makefile.am @@ -69,6 +69,6 @@ EXTRA_DIST = xaacexp.h xaawrap.h xaaLine.c xaaDashLine.c \ xaaStipple.c xaaTEGlyph.c xaaNonTEGlyph.c xaaBitmap.c \ XAA.HOWTO -INCLUDES = $(XORG_INCS) +INCLUDES = $(XORG_INCS) -I$(srcdir)/../../../miext/cw AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) diff --git a/hw/xfree86/xaa/xaaInit.c b/hw/xfree86/xaa/xaaInit.c index deb198946..8d3833e5a 100644 --- a/hw/xfree86/xaa/xaaInit.c +++ b/hw/xfree86/xaa/xaaInit.c @@ -19,6 +19,9 @@ #include "xaawrap.h" #include "xf86fbman.h" #include "servermd.h" +#ifdef COMPOSITE +#include "cw.h" +#endif #define MAX_PREALLOC_MEM 65536 /* MUST be >= 1024 */ |