Re: [Xen-ia64-devel] [PATCH 12/12]MCA handler support for Xen/ia64 TAKE 2

[Alex Williamson <alex.williamson@xxxxxx>]

On Fri, 2006-09-22 at 19:33 +0900, SUZUKI Kazuhiro wrote:
> [12/12] Fix conflicts of typedef of UINT64 and BOOLEAN.[mca-typedef.patch]

   This is kind of ugly.  Can we converge on a single definition for
these or at least confine the fix to the ia64 specific code?  Thanks,

        Alex

> plain text document attachment (mca-typedef.patch)
> diff -r 3e4fa8b5b245 xen/include/acpi/actypes.h
> --- a/xen/include/acpi/actypes.h      Tue Sep 12 11:43:22 2006 -0600
> +++ b/xen/include/acpi/actypes.h      Fri Sep 22 09:26:49 2006 +0900
> @@ -103,12 +103,18 @@ typedef COMPILER_DEPENDENT_UINT64       
>   * 64-bit type definitions
>   */
>  typedef unsigned char                   UINT8;
> +#ifndef      __TYPEDEF_BOOLEAN__
> +#define      __TYPEDEF_BOOLEAN__
>  typedef unsigned char                   BOOLEAN;
> +#endif       /* __TYPEDEF_BOOLEAN__ */
>  typedef unsigned short                  UINT16;
>  typedef int                             INT32;
>  typedef unsigned int                    UINT32;
>  typedef COMPILER_DEPENDENT_INT64        INT64;
> +#ifndef      __TYPEDEF_UINT64__
> +#define      __TYPEDEF_UINT64__
>  typedef COMPILER_DEPENDENT_UINT64       UINT64;
> +#endif       /* __TYPEDEF_UINT64__ */
>  
>  /*! [End] no source code translation !*/
>  
> diff -r 3e4fa8b5b245 xen/include/asm-ia64/vcpu.h
> --- a/xen/include/asm-ia64/vcpu.h     Tue Sep 12 11:43:22 2006 -0600
> +++ b/xen/include/asm-ia64/vcpu.h     Fri Sep 22 09:26:49 2006 +0900
> @@ -10,9 +10,15 @@
>  #include <asm/ia64_int.h>
>  #include <xen/types.h>
>  #include <public/xen.h>
> +#ifndef      __TYPEDEF_UINT64__
> +#define      __TYPEDEF_UINT64__
>  typedef      unsigned long UINT64;
> +#endif       /* __TYPEDEF_UINT64__ */
>  typedef      unsigned int UINT;
> +#ifndef      __TYPEDEF_BOOLEAN__
> +#define      __TYPEDEF_BOOLEAN__
>  typedef      int BOOLEAN;
> +#endif       /* __TYPEDEF_BOOLEAN__ */
>  struct vcpu;
>  typedef      struct vcpu VCPU;
>  typedef cpu_user_regs_t REGS;

-- 
Alex Williamson                             HP Open Source & Linux Org.


_______________________________________________
Xen-ia64-devel mailing list
Xen-ia64-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-ia64-devel