From e1770d6eb853111da13b5170b016b9f16eef94d4 Mon Sep 17 00:00:00 2001 From: zzulilyw Date: Sat, 20 Apr 2024 18:22:59 +0800 Subject: [PATCH] Fix redefined error Issue: https://gitee.com/openharmony/third_party_musl/issues/I9AILH Build & Boot devices & xts Signed-off-by: zzulilyw --- third_party/musl/ndk_musl_include/mqueue.h | 2 +- third_party/musl/ndk_musl_include/netinet/ip_icmp.h | 2 +- third_party/musl/ndk_musl_include/utmpx.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/third_party/musl/ndk_musl_include/mqueue.h b/third_party/musl/ndk_musl_include/mqueue.h index 59c8de63a8d..0d25f5ff094 100644 --- a/third_party/musl/ndk_musl_include/mqueue.h +++ b/third_party/musl/ndk_musl_include/mqueue.h @@ -15,7 +15,7 @@ extern "C" { typedef int mqd_t; struct mq_attr { - long mq_flags, mq_maxmsg, mq_msgsize, mq_curmsgs, __unused[4]; + long mq_flags, mq_maxmsg, mq_msgsize, mq_curmsgs, __unused1[4]; }; struct sigevent; diff --git a/third_party/musl/ndk_musl_include/netinet/ip_icmp.h b/third_party/musl/ndk_musl_include/netinet/ip_icmp.h index 5cbdb4a1c8a..d039bf38005 100644 --- a/third_party/musl/ndk_musl_include/netinet/ip_icmp.h +++ b/third_party/musl/ndk_musl_include/netinet/ip_icmp.h @@ -20,7 +20,7 @@ struct icmphdr { } echo; uint32_t gateway; struct { - uint16_t __unused; + uint16_t __unused1; uint16_t mtu; } frag; uint8_t reserved[4]; diff --git a/third_party/musl/ndk_musl_include/utmpx.h b/third_party/musl/ndk_musl_include/utmpx.h index a79116a04f7..e98ce922b50 100644 --- a/third_party/musl/ndk_musl_include/utmpx.h +++ b/third_party/musl/ndk_musl_include/utmpx.h @@ -33,7 +33,7 @@ struct utmpx { #endif struct timeval ut_tv; unsigned ut_addr_v6[4]; - char __unused[20]; + char __unused1[20]; }; #if defined(_BSD_SOURCE) || defined(_GNU_SOURCE) -- Gitee