From: Robert Kuban <robert.kuban@opensynergy.com>
Date: Mon, 18 Jul 2022 17:20:47 +0000 (+0200)
Subject: Add patch to avoid conflict with __unused macro
X-Git-Tag: RELEASE-0.11.0~18
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=b2e7984cffc9f940bd12170d95aaba7461f1b532;p=unikraft%2Flibs%2Fmusl.git

Add patch to avoid conflict with __unused macro

The added patch renames `__unused` to `_pad` in `aarch64/bits/stat.h`,
following the pattern of patch 0003.

Signed-off-by: Robert Kuban <robert.kuban@opensynergy.com>
Reviewed-by: Eduard Vintilă <eduard.vintila47@gmail.com>
Reviewed-by: Razvan Virtan <virtanrazvan@gmail.com>
Reviewed-by: Razvan Deaconescu <razvand@unikraft.io>
Approved-by: Razvan Deaconescu <razvand@unikraft.io>
Tested-by: Unikraft CI <monkey@unikraft.io>
GitHub-Closes: #6
---

diff --git a/patches/0018-Field-name-__unused-conflicts-with-Unikraft-__unused.patch b/patches/0018-Field-name-__unused-conflicts-with-Unikraft-__unused.patch
new file mode 100644
index 0000000..f588804
--- /dev/null
+++ b/patches/0018-Field-name-__unused-conflicts-with-Unikraft-__unused.patch
@@ -0,0 +1,25 @@
+From 814aa07bf4b566f51f7f81bb0a18f4689188f83e Mon Sep 17 00:00:00 2001
+From: Robert Kuban <robert.kuban@opensynergy.com>
+Date: Mon, 18 Jul 2022 13:19:41 +0200
+Subject: [PATCH 1/3] Field name `__unused` conflicts with Unikraft `__unused`
+ macro.
+
+Signed-off-by: Robert Kuban <robert.kuban@opensynergy.com>
+---
+ arch/aarch64/bits/stat.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/arch/aarch64/bits/stat.h b/arch/aarch64/bits/stat.h
+index b7f4221b..d1778f74 100644
+--- a/arch/aarch64/bits/stat.h
++++ b/arch/aarch64/bits/stat.h
+@@ -14,5 +14,5 @@ struct stat {
+ 	struct timespec st_atim;
+ 	struct timespec st_mtim;
+ 	struct timespec st_ctim;
+-	unsigned __unused[2];
++	unsigned _pad[2];
+ };
+-- 
+2.25.1
+