[Xen-changelog] [xen-unstable] Prefix unnamed union structure fields with __extension__ to make it

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1206468120 0
# Node ID f5e6cccfdda5537876d6fc2b87ea1124d6043fc8
# Parent  8954bf1b5cab2141236b29189391f1f68d34bfdb
Prefix unnamed union structure fields with __extension__ to make it
work properly even in e.g. C99 standard mode.

Signed-off-by: Samuel Thibault <samuel.thibault@xxxxxxxxxxxxx>
---
 tools/include/xen-foreign/mkheader.py    |    2 +-
 xen/include/public/arch-ia64.h           |   12 +++++++-----
 xen/include/public/arch-x86/xen-x86_64.h |    2 +-
 3 files changed, 9 insertions(+), 7 deletions(-)

diff -r 8954bf1b5cab -r f5e6cccfdda5 tools/include/xen-foreign/mkheader.py
--- a/tools/include/xen-foreign/mkheader.py     Tue Mar 25 17:56:49 2008 +0000
+++ b/tools/include/xen-foreign/mkheader.py     Tue Mar 25 18:02:00 2008 +0000
@@ -38,7 +38,7 @@ inttypes["x86_64"] = {
 };
 header["x86_64"] = """
 #ifdef __GNUC__
-# define __DECL_REG(name) union { uint64_t r ## name, e ## name; }
+# define __DECL_REG(name) __extension__ union { uint64_t r ## name, e ## name; 
}
 # define __align8__ __attribute__((aligned (8)))
 #else
 # define __DECL_REG(name) uint64_t r ## name
diff -r 8954bf1b5cab -r f5e6cccfdda5 xen/include/public/arch-ia64.h
--- a/xen/include/public/arch-ia64.h    Tue Mar 25 17:56:49 2008 +0000
+++ b/xen/include/public/arch-ia64.h    Tue Mar 25 18:02:00 2008 +0000
@@ -64,6 +64,8 @@ typedef unsigned long xen_pfn_t;
 
 #ifndef __ASSEMBLY__
 
+#define __anonymous_union __extension__ union
+
 typedef unsigned long xen_ulong_t;
 
 #ifdef __XEN_TOOLS__
@@ -165,11 +167,11 @@ struct mapped_regs {
     unsigned long  reserved1[29];
     unsigned long  vhpi;
     unsigned long  reserved2[95];
-    union {
+    __anonymous_union {
         unsigned long  vgr[16];
         unsigned long bank1_regs[16]; // bank1 regs (r16-r31) when bank0 active
     };
-    union {
+    __anonymous_union {
         unsigned long  vbgr[16];
         unsigned long bank0_regs[16]; // bank0 regs (r16-r31) when bank1 active
     };
@@ -180,7 +182,7 @@ struct mapped_regs {
     unsigned long  vpsr;
     unsigned long  vpr;
     unsigned long  reserved4[76];
-    union {
+    __anonymous_union {
         unsigned long  vcr[128];
         struct {
             unsigned long dcr;  // CR0
@@ -214,7 +216,7 @@ struct mapped_regs {
             unsigned long rsv6[46];
         };
     };
-    union {
+    __anonymous_union {
         unsigned long  reserved5[128];
         struct {
             unsigned long precover_ifs;
@@ -608,7 +610,7 @@ struct xen_ia64_opt_feature {
 struct xen_ia64_opt_feature {
        unsigned long cmd;              /* Which feature */
        unsigned char on;               /* Switch feature on/off */
-       union {
+       __anonymous_union {
                struct {
                                /* The page protection bit mask of the pte.
                                 * This will be or'ed with the pte. */
diff -r 8954bf1b5cab -r f5e6cccfdda5 xen/include/public/arch-x86/xen-x86_64.h
--- a/xen/include/public/arch-x86/xen-x86_64.h  Tue Mar 25 17:56:49 2008 +0000
+++ b/xen/include/public/arch-x86/xen-x86_64.h  Tue Mar 25 18:02:00 2008 +0000
@@ -142,7 +142,7 @@ struct iret_context {
 
 #ifdef __GNUC__
 /* Anonymous union includes both 32- and 64-bit names (e.g., eax/rax). */
-#define __DECL_REG(name) union { \
+#define __DECL_REG(name) __extension__ union { \
     uint64_t r ## name, e ## name; \
     uint32_t _e ## name; \
 }

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