r128 build breakage?

[Andrew Randrianasulu]

Hello, all.

I  was  trying  to rebuild  X server (1.12 branch + patches from later times) 
and all drivers with new for me gcc 4.9.2 and run into few  issues. While  all 
other  drivers  compiled  OK - r128 one failed.

This  patch helped me  to  build  it, while I'm sure no other  drivers  include 
X11/extensions/*.h  directly.

------------------patch--------------

diff --git a/src/r128_accel.c b/src/r128_accel.c
index c88e8f9..7f70220 100644
--- a/src/r128_accel.c
+++ b/src/r128_accel.c
@@ -1851,7 +1851,7 @@ static void R128MMIOAccelInit(ScrnInfoPtr pScrn, 
XAAInfoRecPtr a)
                                          | LEFT_EDGE_CLIPPING_NEGATIVE_X
                                          | SCANLINE_PAD_DWORD;

-    if (xf86IsEntityShared(info->pEnt-index)) {
+    if (xf86IsEntityShared(info->pEnt->index)) {
         /* If there are more than one devices sharing this entity, we
          * have to assign this call back, otherwise the XAA will be
          * disabled.
diff --git a/src/r128_crtc.c b/src/r128_crtc.c
index 26d4414..07b6775 100644
--- a/src/r128_crtc.c
+++ b/src/r128_crtc.c
@@ -35,6 +35,7 @@

 #include "xf86.h"
 #include "xf86Modes.h"
+#include "X11/extensions/dpmsconst.h"

 #include "r128.h"
 #include "r128_probe.h"
diff --git a/src/r128_output.c b/src/r128_output.c
index 6c35e78..0160880 100644
--- a/src/r128_output.c
+++ b/src/r128_output.c
@@ -35,6 +35,7 @@

 #include "xf86.h"
 #include "xf86Modes.h"
+#include "X11/extensions/dpmsconst.h"

 #include "r128.h"
 #include "r128_probe.h"

----------------------------

Well, only  first part looks  like  typo, and  due  to lack of  hardware  I 
haven't  tested this driver. But may be  it will help  someone.             
-------------- next part --------------
A non-text attachment was scrubbed...
Name: build_fix.diff
Type: text/x-diff
Size: 1093 bytes
Desc: not available
URL: <http://lists.x.org/archives/xorg-driver-ati/attachments/20150116/b545306c/attachment.diff>