On Wed, Aug 6, 2008 at 10:59 AM, Egbert Eich wrote:

Alex Deucher writes:

...

On Wed, Aug 6, 2008 at 5:33 AM, Nico -telmich- Schottelius wrote:

...

Hello!

I am unable to build radeon with DRI [0] and without DRI [1].

I thought the master branch should always work (as in compile and run)?

Can you otherwise open a "stable" branch, so end-testers can use that branch for testing the latest running version?

I can't reproduce any build problems here. Does this patch help?

Hi Alex!

I thought about this solution, too. But then I looked at some header files which include stdint.h for us when we use DRI. They do some sort fo voodoo to figure out if to include this file or another. I've got a patch prepared which uses simple defines for the types. This seems to be saver than typedefs.

Does X even work on a platform that doesn't support stdint.h anymore? Several other drivers already use it. Alex

Cheers, Egbert.

...

Alex diff --git a/src/radeon_accel.c b/src/radeon_accel.c index 5ab4a45..d5ffb8f 100644 --- a/src/radeon_accel.c +++ b/src/radeon_accel.c @@ -56,6 +56,7 @@

#include #include +#include /* Driver data structures */ #ifdef USE_XAA #include "xaa.h" @@ -73,10 +74,6 @@ #ifdef USE_DRI # include "rhd_dri.h" # include "rhd_cp.h" -#else -typedef CARD8 uint8_t; -typedef CARD16 uint16_t; -typedef CARD32 uint32_t; #endif

#include "radeon_accel.h" diff --git a/src/radeon_exa.c b/src/radeon_exa.c index c8bd434..ac5bc8d 100644 --- a/src/radeon_exa.c +++ b/src/radeon_exa.c @@ -33,6 +33,8 @@ #include "config.h" #endif

+#include + #ifdef USE_XAA #include "xaa.h" #endif @@ -48,10 +50,6 @@ #ifdef USE_DRI # include "rhd_dri.h" # include "rhd_cp.h" -#else -typedef CARD8 uint8_t; -typedef CARD16 uint16_t; -typedef CARD32 uint32_t; #endif

#include "radeon_accel.h" diff --git a/src/radeon_textured_video.c b/src/radeon_textured_video.c index 46c2f45..79651a1 100644 --- a/src/radeon_textured_video.c +++ b/src/radeon_textured_video.c @@ -30,6 +30,7 @@ #endif

#include +#include #include #include #include @@ -54,9 +55,6 @@ #ifdef USE_DRI # include "rhd_cp.h" #else -typedef CARD8 uint8_t; -typedef CARD16 uint16_t; -typedef CARD32 uint32_t; #include "damage.h" #endif

diff --git a/src/radeon_video.c b/src/radeon_video.c index d09144c..5921a95 100644 --- a/src/radeon_video.c +++ b/src/radeon_video.c @@ -3,6 +3,7 @@ #endif

#include +#include #include #include #include @@ -24,10 +25,6 @@ #ifdef USE_DRI # include "rhd_dri.h" # include "rhd_cp.h" -#else -typedef CARD8 uint8_t; -typedef CARD16 uint16_t; -typedef CARD32 uint32_t; #endif

#include "radeon_reg.h" diff --git a/src/radeon_xaa.c b/src/radeon_xaa.c index c3325ac..1f9c381 100644 --- a/src/radeon_xaa.c +++ b/src/radeon_xaa.c @@ -66,6 +66,7 @@

#include #include +#include /* Driver data structures */ #ifdef USE_XAA #include "xaa.h" @@ -83,10 +84,6 @@ #ifdef USE_DRI # include "rhd_dri.h" # include "rhd_cp.h" -#else -typedef CARD8 uint8_t; -typedef CARD16 uint16_t; -typedef CARD32 uint32_t; #endif

#include "radeon_accel.h"

-- To unsubscribe, e-mail: radeonhd+unsubscribe@opensuse.org For additional commands, e-mail: radeonhd+help@opensuse.org