|
From: <sv...@va...> - 2014-09-01 20:51:04
|
Author: sewardj
Date: Mon Sep 1 20:50:56 2014
New Revision: 14412
Log:
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.
Modified:
trunk/include/vki/vki-amd64-linux.h
trunk/include/vki/vki-arm-linux.h
trunk/include/vki/vki-arm64-linux.h
trunk/include/vki/vki-linux.h
trunk/include/vki/vki-ppc64-linux.h
trunk/include/vki/vki-s390x-linux.h
Modified: trunk/include/vki/vki-amd64-linux.h
==============================================================================
--- trunk/include/vki/vki-amd64-linux.h (original)
+++ trunk/include/vki/vki-amd64-linux.h Mon Sep 1 20:50:56 2014
@@ -343,7 +343,7 @@
unsigned long st_mtime_nsec;
unsigned long st_ctime;
unsigned long st_ctime_nsec;
- long __unused[3];
+ long __unused0[3];
};
//----------------------------------------------------------------------
Modified: trunk/include/vki/vki-arm-linux.h
==============================================================================
--- trunk/include/vki/vki-arm-linux.h (original)
+++ trunk/include/vki/vki-arm-linux.h Mon Sep 1 20:50:56 2014
@@ -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)));
};
Modified: trunk/include/vki/vki-arm64-linux.h
==============================================================================
--- trunk/include/vki/vki-arm64-linux.h (original)
+++ trunk/include/vki/vki-arm64-linux.h Mon Sep 1 20:50:56 2014
@@ -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;
};
Modified: trunk/include/vki/vki-linux.h
==============================================================================
--- trunk/include/vki/vki-linux.h (original)
+++ trunk/include/vki/vki-linux.h Mon Sep 1 20:50:56 2014
@@ -1417,7 +1417,7 @@
vki_size_t __user *oldlenp;
void __user *newval;
vki_size_t newlen;
- unsigned long __unused[4];
+ unsigned long __unused0[4];
};
//----------------------------------------------------------------------
Modified: trunk/include/vki/vki-ppc64-linux.h
==============================================================================
--- trunk/include/vki/vki-ppc64-linux.h (original)
+++ trunk/include/vki/vki-ppc64-linux.h Mon Sep 1 20:50:56 2014
@@ -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 */
};
Modified: trunk/include/vki/vki-s390x-linux.h
==============================================================================
--- trunk/include/vki/vki-s390x-linux.h (original)
+++ trunk/include/vki/vki-s390x-linux.h Mon Sep 1 20:50:56 2014
@@ -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 */
|