Rename a bunch of __unused fields to __unused0, since some Android

NDK's appear to #define __unused to __attribute__((__unused__)),
causing the build to fail in bizarre ways.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@14412

diff --git a/include/vki/vki-amd64-linux.h b/include/vki/vki-amd64-linux.h
index ed6d56455face4d73f1a55d716ab154f479faa25..61847a7116ab6c476c90f7846ee5c701cc12b8aa 100644 (file)
--- a/include/vki/vki-amd64-linux.h
+++ b/include/vki/vki-amd64-linux.h
@@ -343,7 +343,7 @@ struct vki_stat {
        unsigned long   st_mtime_nsec;
        unsigned long   st_ctime;
        unsigned long   st_ctime_nsec;
-       long            __unused[3];
+       long            __unused0[3];
 };
 
 //----------------------------------------------------------------------

diff --git a/include/vki/vki-arm-linux.h b/include/vki/vki-arm-linux.h
index 39fa6a9f194b358fc043f942e52e94370c630f64..031f52858871076b2f5bb29353fc3efc44b2c0f3 100644 (file)
--- a/include/vki/vki-arm-linux.h
+++ b/include/vki/vki-arm-linux.h
@@ -621,7 +621,7 @@ struct vki_ucontext {
        vki_stack_t             uc_stack;
        struct vki_sigcontext   uc_mcontext;
        vki_sigset_t            uc_sigmask;     /* mask last for extensibility */
-       int               __unused[32 - (sizeof (vki_sigset_t) / sizeof (int))];
+       int              __unused0[32 - (sizeof (vki_sigset_t) / sizeof (int))];
        unsigned long     uc_regspace[128] __attribute__((__aligned__(8)));
 
 };

diff --git a/include/vki/vki-arm64-linux.h b/include/vki/vki-arm64-linux.h
index 690505f144531c27524d9dd4f045670a729218a6..747d0bf801d4cabe2a51f3679a235e8f1f4f25e2 100644 (file)
--- a/include/vki/vki-arm64-linux.h
+++ b/include/vki/vki-arm64-linux.h
@@ -530,7 +530,7 @@ struct vki_ucontext {
         vki_stack_t             uc_stack;
         vki_sigset_t            uc_sigmask;
         /* glibc uses a 1024-bit sigset_t */
-        __vki_u8                __unused[1024 / 8 - sizeof(vki_sigset_t)];
+        __vki_u8                __unused0[1024 / 8 - sizeof(vki_sigset_t)];
         /* last for future expansion */
         struct vki_sigcontext   uc_mcontext;
 };

diff --git a/include/vki/vki-linux.h b/include/vki/vki-linux.h
index c78e00ffec20ac1db6843d6f5081886d507242c0..50f49ff1b32beda418bb8a095fb3f0728166b77c 100644 (file)
--- a/include/vki/vki-linux.h
+++ b/include/vki/vki-linux.h
@@ -1417,7 +1417,7 @@ struct __vki_sysctl_args {
        vki_size_t __user *oldlenp;
        void __user *newval;
        vki_size_t newlen;
-       unsigned long __unused[4];
+       unsigned long __unused0[4];
 };
 
 //----------------------------------------------------------------------

diff --git a/include/vki/vki-ppc64-linux.h b/include/vki/vki-ppc64-linux.h
index 1edc34d5e8b80e72b53b29c25e8710dffaf0a1d1..8848b05764ef0e83033a226fdb853525fbdd95ab 100644 (file)
--- a/include/vki/vki-ppc64-linux.h
+++ b/include/vki/vki-ppc64-linux.h
@@ -681,7 +681,7 @@ struct vki_ucontext {
   struct vki_ucontext  *uc_link;
   vki_stack_t           uc_stack;
   vki_sigset_t          uc_sigmask;
-  vki_sigset_t          __unused[15]; /* Allow for uc_sigmask growth */
+  vki_sigset_t          __unused0[15]; /* Allow for uc_sigmask growth */
   struct vki_sigcontext uc_mcontext;  /* last for extensibility */
 };
 

diff --git a/include/vki/vki-s390x-linux.h b/include/vki/vki-s390x-linux.h
index c380ec4ab5f92eab206596adf139b6321c235999..902bbf5cff6a88857d121ecf23dc623eeb79df4c 100644 (file)
--- a/include/vki/vki-s390x-linux.h
+++ b/include/vki/vki-s390x-linux.h
@@ -462,7 +462,7 @@ struct vki_stat {
        unsigned long  st_ctime_nsec;
         unsigned long  st_blksize;
         long           st_blocks;
-        unsigned long  __unused[3];
+        unsigned long  __unused0[3];
 };
 
 #endif /* VGA_s390x */