logo

oasis

Own branch of Oasis Linux (upstream: <https://git.sr.ht/~mcf/oasis/>) git clone https://anongit.hacktivis.me/git/oasis.git
commit: bc99da741d96d9e98450ca7c672a25a8eb0c14e8
parent 066e68c4fe79238bc3377dea38585eb56b5934b1
Author: Michael Forney <mforney@mforney.org>
Date:   Tue, 26 Oct 2021 19:59:39 -0700

musl: Add patch to use preferred location for packed attribute

Diffstat:

Apkg/musl/patch/0003-use-preferred-syntactic-location-for-epoll_event-pac.patch37+++++++++++++++++++++++++++++++++++++
Mpkg/musl/ver2+-
2 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/pkg/musl/patch/0003-use-preferred-syntactic-location-for-epoll_event-pac.patch b/pkg/musl/patch/0003-use-preferred-syntactic-location-for-epoll_event-pac.patch @@ -0,0 +1,37 @@ +From 3c3a5a3208341615cefc3be9383e04cab32f9bfb Mon Sep 17 00:00:00 2001 +From: Michael Forney <mforney@mforney.org> +Date: Tue, 26 Oct 2021 15:27:31 -0700 +Subject: [PATCH] use preferred syntactic location for epoll_event packed + attribute + +--- + include/sys/epoll.h | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/include/sys/epoll.h b/include/sys/epoll.h +index ac81a841..de4fe0e7 100644 +--- a/include/sys/epoll.h ++++ b/include/sys/epoll.h +@@ -45,14 +45,14 @@ typedef union epoll_data { + uint64_t u64; + } epoll_data_t; + +-struct epoll_event { +- uint32_t events; +- epoll_data_t data; +-} ++struct + #ifdef __x86_64__ + __attribute__ ((__packed__)) + #endif +-; ++epoll_event { ++ uint32_t events; ++ epoll_data_t data; ++}; + + + int epoll_create(int); +-- +2.32.0 + diff --git a/pkg/musl/ver b/pkg/musl/ver @@ -1 +1 @@ -1.2.2 r4 +1.2.2 r5