xf86-video-ati: Branch 'master'

[Michel Dänzer]

 src/radeon.h |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d64a13ebe0ecd241ee3260dbffd8f4a01e254183
Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Wed May 20 09:58:38 2015 +0900

    Replace SyncFence typedef with declaration of struct _SyncFence
    
    Fixes build failure in some environments:
    
      CC     radeon_sync.lo
    In file included from radeon_sync.c:28:
    /home/tinderbox/xorg-build/include/xorg/misync.h:31: error: redefinition of typedef 'SyncFence'
    radeon.h:93: note: previous declaration of 'SyncFence' was here
    make[2]: *** [radeon_sync.lo] Error 1
    
    Reported-Tested-and-Acked-by: David Airlie <airlied at redhat.com>

diff --git a/src/radeon.h b/src/radeon.h
index 7feed04..d6f18fa 100644
--- a/src/radeon.h
+++ b/src/radeon.h
@@ -90,7 +90,7 @@
 #include "simple_list.h"
 #include "atipcirename.h"
 
-typedef struct _SyncFence SyncFence;
+struct _SyncFence;
 
 #ifndef MAX
 #define MAX(a,b) ((a)>(b)?(a):(b))
@@ -457,7 +457,7 @@ typedef struct {
 
     void              (*BlockHandler)(BLOCKHANDLER_ARGS_DECL);
 
-    void              (*CreateFence) (ScreenPtr pScreen, SyncFence *pFence,
+    void              (*CreateFence) (ScreenPtr pScreen, struct _SyncFence *pFence,
 				      Bool initially_triggered);
 
     int               pix24bpp;         /* Depth of pixmap for 24bpp fb      */