Mailinglist Archive: radeonhd (145 mails)

[Matthias Hopf <mhopf@xxxxxxx>]

On Dec 10, 08 14:42:21 +0100, Hans Ulrich Niedermann wrote:
> In fact, I have been building the Fedora packages using
> make CPPFLAGS='-D__user="" -DDEPRECATED="__attribute__ ((deprecated))"'
> for some time now.

Can anybody test the attached patch? It's a sort-of workaround until we
have a real fix - which I don't know how it should look like.

CU

Matthias

-- 
Matthias Hopf <mhopf@xxxxxxx>      __        __   __
Maxfeldstr. 5 / 90409 Nuernberg   (_   | |  (_   |__          mat@xxxxxxxxx
Phone +49-911-74053-715           __)  |_|  __)  |__  R & D   www.mshopf.de
> From 6c91fed64b6abe1d381432be5c806e450b9ad597 Mon Sep 17 00:00:00 2001
From: Matthias Hopf <mhopf@xxxxxxx>
Date: Thu, 11 Dec 2008 13:05:57 +0100
Subject: [PATCH] Workaround for drm header mismatches (DEPRECATED and __user on 
Fedora 10)

---
 src/rhd_cs.c  |    5 +++++
 src/rhd_dri.c |    5 +++++
 2 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/src/rhd_cs.c b/src/rhd_cs.c
index 2c9839d..256c1ae 100644
--- a/src/rhd_cs.c
+++ b/src/rhd_cs.c
@@ -190,6 +190,11 @@ CSMMIOInit(struct RhdCS *CS)
  */
 
 #include "xf86drm.h"
+/* Workaround for header mismatches */
+#ifndef DEPRECATED
+#  define DEPRECATED __attribute__ ((deprecated))
+#  define __user
+#endif
 #include "radeon_drm.h"
 
 #define R5XX_IDLE_RETRY 16 /* Fall out of idle loops after this count */
diff --git a/src/rhd_dri.c b/src/rhd_dri.c
index dd1ed13..0ef6780 100644
--- a/src/rhd_dri.c
+++ b/src/rhd_dri.c
@@ -57,6 +57,11 @@
 /* GLX/DRI/DRM definitions */
 #define _XF86DRI_SERVER_
 #include "dri.h"
+/* Workaround for header mismatches */
+#ifndef DEPRECATED
+#  define DEPRECATED __attribute__ ((deprecated))
+#  define __user
+#endif
 #include "radeon_drm.h"
 #include "GL/glxint.h"
 #include "GL/glxtokens.h"
-- 
1.5.6