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

[SUZUKI Kazuhiro <kaz@xxxxxxxxxxxxxx>]

[12/12] Fix conflicts of typedef of UINT64 and BOOLEAN.[mca-typedef.patch]

Signed-off-by: Yutaka Ezaki <yutaka.ezaki@xxxxxxxxxxxxxx>
Signed-off-by: Masaki Kanno <kanno.masaki@xxxxxxxxxxxxxx>
Signed-off-by: Kazuhiro Suzuki <kaz@xxxxxxxxxxxxxx>

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;

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