]> xenbits.xensource.com Git - unikraft/libs/musl.git/commitdiff
Add patch to rename __unused field to pad
authorGaulthier Gain <gaulthier.gain@uliege.be>
Wed, 29 Jan 2020 21:18:32 +0000 (22:18 +0100)
committerSimon Kuenzer <simon.kuenzer@neclab.eu>
Thu, 30 Jan 2020 20:55:56 +0000 (21:55 +0100)
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@uliege.be>
Reviewed-by: Simon Kuenzer <simon.kuenzer@neclab.eu>
patches/0003-Avoid-reserved-__unused-in-stat.h.patch [new file with mode: 0644]

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 (file)
index 0000000..6d0b72e
--- /dev/null
@@ -0,0 +1,26 @@
+From 851762e66ca264fd26240aa9349ba4db6cfdd2e6 Mon Sep 17 00:00:00 2001
+From: Gaulthier Gain <gaulthier.gain@uliege.be>
+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@uliege.be>
+---
+ 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
+