Mailinglist Archive: radeonhd (333 mails)
| < Previous | Next > |
Re: [radeonhd] conflicting types for xf86jmp_buf (again)
- From: Matthias Hopf <mhopf@xxxxxxx>
- Date: Tue, 14 Oct 2008 12:36:30 +0200
- Message-id: <20081014103630.GA24451@xxxxxxx>
On Oct 13, 08 22:14:36 -0700, Adam Williamson wrote:
!@#$% It's *really* time to nuke HAVE_XF86_ANSIC_H. Don't remember why
we didn't kill it in the same time frame as the other drivers, but there
was a reason.
Hm. I don't understand this, in my /usr/include/xorg/opaque.h there is
no inclusion of setjmp.h...
Can you check your opaque.h? It'll be difficult to solve, if that file
includes a system header, and we're not supposed to do so.
FWIW, you can try the attached patch, maybe this already helps...
Matthias
--
Matthias Hopf <mhopf@xxxxxxx> __ __ __
Maxfeldstr. 5 / 90409 Nuernberg (_ | | (_ |__ mat@xxxxxxxxx
Phone +49-911-74053-715 __) |_| __) |__ R & D www.mshopf.de
diff --git a/src/radeon_exa_render.c b/src/radeon_exa_render.c
index 6d25446..4e003ba 100644
--- a/src/radeon_exa_render.c
+++ b/src/radeon_exa_render.c
@@ -69,6 +69,7 @@
#endif
#include "xf86.h"
+#include "exa.h"
#include "rhd.h"
#include "rhd_cs.h"
@@ -77,8 +78,6 @@
#include "r5xx_accel.h"
#include "r5xx_3dregs.h"
-#include "exa.h"
-
#define VAR_PREAMBLE(pScreen) RHDPtr rhdPtr =
RHDPTR(xf86Screens[(pScreen)->myNum])
#define THREEDSTATE_PREAMBLE() struct R5xx3D *accel_state =
rhdPtr->ThreeDPrivate
/*
On Mon, 2008-10-13 at 20:29 +0200, Matthias Hopf wrote:
On Jul 30, 08 14:54:16 -0700, Adam Williamson wrote:
As written above, current git does not build on Mandriva with a
'conflicting types for xf86jmp_buf' error. This has happened twice
before and been corrected upstream both times, and I was asked to
report it if it happens again. Well, it's happening. :)
Just to make sure - this is working again, isn't it?
...and it just came back again, in 1.2.3:
!@#$% It's *really* time to nuke HAVE_XF86_ANSIC_H. Don't remember why
we didn't kill it in the same time frame as the other drivers, but there
was a reason.
gcc -DHAVE_CONFIG_H -I. -I.. -I./AtomBios/includes -I/usr/include/xorg
-I/usr/include/pixman-1 -I/usr/include/drm -I/usr/include/X11/dri -Wall
-Wextra -Wno-unused-parameter -Werror-implicit-function-declaration
-Wstrict-aliasing -Wstrict-overflow -Wpointer-arith -Woverlength-strings
-Wvolatile-register-var -Winit-self -Wbad-function-cast
-Wstrict-prototypes -Wold-style-definition -Wnested-externs
-Wdisabled-optimization -pedantic -Wno-long-long -Wno-variadic-macros
-O2 -g -pipe -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector
--param=ssp-buffer-size=4 -fomit-frame-pointer -march=i586
-mtune=generic -fasynchronous-unwind-tables -finline-functions -MT
radeonhd_drv_la-radeon_exa_render.lo -MD -MP
-MF .deps/radeonhd_drv_la-radeon_exa_render.Tpo -c radeon_exa_render.c
-fPIC -DPIC -o .libs/radeonhd_drv_la-radeon_exa_render.o
In file included from /usr/include/xorg/opaque.h:48,
from /usr/include/xorg/windowstr.h:60,
from /usr/include/xorg/exa.h:36,
from r5xx_exa.c:56:
/usr/include/setjmp.h:49: error: conflicting types for 'xf86jmp_buf'
Hm. I don't understand this, in my /usr/include/xorg/opaque.h there is
no inclusion of setjmp.h...
Can you check your opaque.h? It'll be difficult to solve, if that file
includes a system header, and we're not supposed to do so.
FWIW, you can try the attached patch, maybe this already helps...
Matthias
--
Matthias Hopf <mhopf@xxxxxxx> __ __ __
Maxfeldstr. 5 / 90409 Nuernberg (_ | | (_ |__ mat@xxxxxxxxx
Phone +49-911-74053-715 __) |_| __) |__ R & D www.mshopf.de
diff --git a/src/radeon_exa_render.c b/src/radeon_exa_render.c
index 6d25446..4e003ba 100644
--- a/src/radeon_exa_render.c
+++ b/src/radeon_exa_render.c
@@ -69,6 +69,7 @@
#endif
#include "xf86.h"
+#include "exa.h"
#include "rhd.h"
#include "rhd_cs.h"
@@ -77,8 +78,6 @@
#include "r5xx_accel.h"
#include "r5xx_3dregs.h"
-#include "exa.h"
-
#define VAR_PREAMBLE(pScreen) RHDPtr rhdPtr =
RHDPTR(xf86Screens[(pScreen)->myNum])
#define THREEDSTATE_PREAMBLE() struct R5xx3D *accel_state =
rhdPtr->ThreeDPrivate
/*
| < Previous | Next > |