From: Gaulthier Gain Date: Wed, 29 Jan 2020 21:18:32 +0000 (+0100) Subject: Add patch to rename __unused field to pad X-Git-Tag: RELEASE-0.4~19 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=e0765968a98f8bc2b16eb4bb1cb5961c2ea1e533;p=unikraft%2Flibs%2Fmusl.git Add patch to rename __unused field to pad 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 Reviewed-by: Simon Kuenzer --- 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 +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 +--- + 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 +