[pkgsrc/trunk]: pkgsrc/x11/xf86-video-radeonhd P: Compilation fails due to re...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/71c4aa177f02
branches:  trunk
changeset: 539683:71c4aa177f02
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Tue Mar 11 14:36:13 2008 +0000

description:
P: Compilation fails due to redefinition of uint32_t and friends.
A: Why don't you just use inttypes.h?

diffstat:

 x11/xf86-video-radeonhd/distinfo         |   3 +-
 x11/xf86-video-radeonhd/patches/patch-aa |  39 ++++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+), 1 deletions(-)

diffs (54 lines):

diff -r 5f1932a5e483 -r 71c4aa177f02 x11/xf86-video-radeonhd/distinfo
--- a/x11/xf86-video-radeonhd/distinfo  Tue Mar 11 13:31:32 2008 +0000
+++ b/x11/xf86-video-radeonhd/distinfo  Tue Mar 11 14:36:13 2008 +0000
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.3 2007/12/21 16:57:13 joerg Exp $
+$NetBSD: distinfo,v 1.4 2008/03/11 14:36:13 joerg Exp $
 
 SHA1 (xf86-video-radeonhd-1.1.0.tar.bz2) = 5553bbceafd80714c03a6c60479bd9bc9eacb63e
 RMD160 (xf86-video-radeonhd-1.1.0.tar.bz2) = 254fc96418c5b91b1e3bf2d4455153f705f8316e
 Size (xf86-video-radeonhd-1.1.0.tar.bz2) = 446297 bytes
+SHA1 (patch-aa) = 1c25ceaf16b69faf14dc04d4145bb6be2466bfe7
diff -r 5f1932a5e483 -r 71c4aa177f02 x11/xf86-video-radeonhd/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/xf86-video-radeonhd/patches/patch-aa  Tue Mar 11 14:36:13 2008 +0000
@@ -0,0 +1,39 @@
+$NetBSD: patch-aa,v 1.4 2008/03/11 14:36:13 joerg Exp $
+
+--- src/AtomBios/includes/CD_Common_Types.h.orig       2008-03-11 15:17:08.000000000 +0100
++++ src/AtomBios/includes/CD_Common_Types.h
+@@ -37,32 +37,8 @@ Revision History:
+ #ifndef _COMMON_TYPES_H_
+       #define _COMMON_TYPES_H_
+ 
+-    #ifndef LINUX
+-      #if _MSC_EXTENSIONS 
+-    
+-    //
+-    // use Microsoft* C complier dependent interger width types 
+-    //
+-      //    typedef unsigned __int64    uint64_t;
+-      //    typedef __int64             int64_t;
+-              typedef unsigned __int32    uint32_t;
+-              typedef __int32             int32_t;
+-#elif defined (__linux__) || defined (__NetBSD__) || defined(__sun) || defined(__OpenBSD__) || defined (__FreeBSD__)
+-              typedef unsigned int uint32_t;
+-              typedef int int32_t;
+-      #else
+-              typedef unsigned long       uint32_t;
+-              typedef signed long         int32_t;
+-      #endif
+-              typedef unsigned char       uint8_t;
+-#if (defined(__sun) && defined(_CHAR_IS_SIGNED))
+-              typedef char                int8_t;
+-#else
+-              typedef signed char         int8_t;
+-#endif
+-              typedef unsigned short      uint16_t;
+-              typedef signed short        int16_t;
+-      #endif
++#include <inttypes.h>
++
+ #ifndef       UEFI_BUILD
+               typedef signed int                      intn_t;
+               typedef unsigned int            uintn_t;