| commit | 36ffaf54065655ac89999303a64a328df9b86543 | [log] [tgz] |
|---|---|---|
| author | Andrew Hsieh <andrewhsieh@google.com> | Tue Sep 25 21:32:45 2012 -0700 |
| committer | Andrew Hsieh <andrewhsieh@google.com> | Wed Sep 26 15:11:39 2012 -0700 |
| tree | dfc5b55fd1f16d5ea3895bc1e90393c8f6cc9757 | |
| parent | b07d7f6c25fe3ea99186c2cdb034449e75419518 [diff] |
Replace __unused in linux/sysctl.h with __linux_unused To avoid conflict with "#define __unused" in sys/cdefs.h See https://android-review.googlesource.com/#/c/43479 https://android-review.googlesource.com/#/c/43565 Change-Id: I6b8155570f4398b3ee8845d75bd231bca7f1d86f
diff --git a/ndk/platforms/android-3/include/linux/icmp.h b/ndk/platforms/android-3/include/linux/icmp.h index c5b58bb..d69a0e2 100644 --- a/ndk/platforms/android-3/include/linux/icmp.h +++ b/ndk/platforms/android-3/include/linux/icmp.h
@@ -66,7 +66,7 @@ } echo; __u32 gateway; struct { - __u16 __unused_field; + __u16 __linux_unused; __u16 mtu; } frag; } un;
diff --git a/ndk/platforms/android-3/include/linux/sysctl.h b/ndk/platforms/android-3/include/linux/sysctl.h index 329e561..730c740 100644 --- a/ndk/platforms/android-3/include/linux/sysctl.h +++ b/ndk/platforms/android-3/include/linux/sysctl.h
@@ -28,7 +28,7 @@ size_t __user *oldlenp; void __user *newval; size_t newlen; - unsigned long __unused[4]; + unsigned long __linux_unused[4]; }; enum