diff options
| author | Elliott Hughes <enh@google.com> | 2012-09-26 15:01:41 -0700 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2012-09-26 15:01:41 -0700 |
| commit | 7f72817730203e59c142106e9f3a865a9232e00f (patch) | |
| tree | daeff46d290091e6d4dbf02baa65d60108616e16 | |
| parent | 77579f14ca6ebf04da7b74fe6547c2ed46b2cfe5 (diff) | |
| parent | cc3c4b0f8f9e3790923ce6c5f12bcb0e82a684cd (diff) | |
| download | kernel-headers-tools_r21.tar.gz | |
Merge "__unused would be modified to __linux_unused by the bionic scripts which clean the kernel headers. Move icmp.h to its original form."tools_r21
| -rw-r--r-- | original/linux/icmp.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/original/linux/icmp.h b/original/linux/icmp.h index b68dcfb..f0b571f 100644 --- a/original/linux/icmp.h +++ b/original/linux/icmp.h @@ -76,11 +76,7 @@ struct icmphdr { } echo; __u32 gateway; struct { -#if 0 /* BIONIC: __unused is defined as "" */ __u16 __unused; -#else - __u16 __unused_field; -#endif __u16 mtu; } frag; } un; |