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 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/include/vki/vki-amd64-linux.h b/include/vki/vki-amd64-linux.h
index ed6d564..61847a7 100644
--- a/include/vki/vki-amd64-linux.h
+++ b/include/vki/vki-amd64-linux.h
@@ -343,7 +343,7 @@
 	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 39fa6a9..031f528 100644
--- a/include/vki/vki-arm-linux.h
+++ b/include/vki/vki-arm-linux.h
@@ -621,7 +621,7 @@
 	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 690505f..747d0bf 100644
--- a/include/vki/vki-arm64-linux.h
+++ b/include/vki/vki-arm64-linux.h
@@ -530,7 +530,7 @@
         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 c78e00f..50f49ff 100644
--- a/include/vki/vki-linux.h
+++ b/include/vki/vki-linux.h
@@ -1417,7 +1417,7 @@
 	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 1edc34d..8848b05 100644
--- a/include/vki/vki-ppc64-linux.h
+++ b/include/vki/vki-ppc64-linux.h
@@ -681,7 +681,7 @@
   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 c380ec4..902bbf5 100644
--- a/include/vki/vki-s390x-linux.h
+++ b/include/vki/vki-s390x-linux.h
@@ -462,7 +462,7 @@
 	unsigned long  st_ctime_nsec;
         unsigned long  st_blksize;
         long           st_blocks;
-        unsigned long  __unused[3];
+        unsigned long  __unused0[3];
 };
 
 #endif /* VGA_s390x */