Re: [Minios-devel] [UNIKRAFT/MUSL PATCH V2 09/28] Add patch to rename __unused field to pad

[Simon Kuenzer <simon.kuenzer@xxxxxxxxx>]

Oh, this is terrible that this happens, unfortunately... The fix is 
fine. Is this happening also on other musl headers?
Reviewed-by: Simon Kuenzer <simon.kuenzer@xxxxxxxxx>

On 29.01.20 22:18, Gaulthier Gain wrote:
> This patch renames __unused in arch/x86_64/bits/stat.h to pad
> since __unused is a keyword in Unikraft.
>
> Signed-off-by: Gaulthier Gain <gaulthier.gain@xxxxxxxxx>
> ---
>   ...03-Avoid-reserved-__unused-in-stat.h.patch | 26 +++++++++++++++++++
>   1 file changed, 26 insertions(+)
>   create mode 100644 patches/0003-Avoid-reserved-__unused-in-stat.h.patch
>
> diff --git a/patches/0003-Avoid-reserved-__unused-in-stat.h.patch 
> b/patches/0003-Avoid-reserved-__unused-in-stat.h.patch
> new file mode 100644
> index 0000000..6d0b72e
> --- /dev/null
> +++ b/patches/0003-Avoid-reserved-__unused-in-stat.h.patch
> @@ -0,0 +1,26 @@
> +From 851762e66ca264fd26240aa9349ba4db6cfdd2e6 Mon Sep 17 00:00:00 2001
> +From: Gaulthier Gain <gaulthier.gain@xxxxxxxxx>
> +Date: Wed, 16 Oct 2019 16:32:23 +0200
> +Subject: [PATCH] Avoid reserved __unused in stat.h
> +
> +Field name `__unused` conflicts with Unikraft `__unused` macro.
> +
> +Signed-off-by: Gaulthier Gain <gaulthier.gain@xxxxxxxxx>
> +---
> + arch/x86_64/bits/stat.h | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/arch/x86_64/bits/stat.h b/arch/x86_64/bits/stat.h
> +index 081237c3..39b3cdd4 100644
> +--- a/arch/x86_64/bits/stat.h
> ++++ b/arch/x86_64/bits/stat.h
> +@@ -18,5 +18,5 @@ struct stat {
> +       struct timespec st_atim;
> +       struct timespec st_mtim;
> +       struct timespec st_ctim;
> +-      long __unused[3];
> ++      long _pad[3];
> + };
> +--
> +2.23.0
> +
_______________________________________________
Minios-devel mailing list
Minios-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/minios-devel