xf86-video-mach64: Branch 'master'

[Adam Jackson]

 src/atistruct.h |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 42c4e423eec789606eec9703be23a9fd4483a14a
Author: Adam Jackson <ajax at redhat.com>
Date:   Tue Oct 2 10:19:47 2012 -0400

    Fix build with neither XAA nor EXA against xserver 1.13.0
    
    Pull in picturestr.h to get GLYPH_HAS_GLYPH_PICTURE_ACCESSOR defined
    before compat-api.h is parsed, otherwise you fail with:
    
    In file included from /usr/include/xorg/picturestr.h:28:0,
                     from /usr/include/xorg/exa.h:38,
                     from atimach64accel.h:31,
                     from atiscreen.c:46:
    /usr/include/xorg/glyphstr.h:138:2: error: expected ')' before '*' token
    /usr/include/xorg/glyphstr.h:138:2: error: expected ')' before '(' token
    /usr/include/xorg/glyphstr.h:140:2: error: expected ')' before '*' token
    /usr/include/xorg/glyphstr.h:140:2: error: expected ')' before '(' token
    
    Signed-off-by: Adam Jackson <ajax at redhat.com>

diff --git a/src/atistruct.h b/src/atistruct.h
index 702360b..98dc15e 100644
--- a/src/atistruct.h
+++ b/src/atistruct.h
@@ -51,6 +51,7 @@
 
 #endif /* TV_OUT */
 
+#include "picturestr.h"
 #ifdef USE_EXA
 #include "exa.h"
 #endif