Hi Jan, > > The headers bootguard.h and utils.h mutually #include each other > > for no apparent reason. Hence, disentangle their #include relation > > to allow selective inclusion. > > > > One problem of this is, e.g., utils.h defines _VOLUME_DESC > > after #include "bootguard.h". However, bootguard.h uses > > this in extern VOLUME_DESC *volumes. > > > > Signed-off-by: Christian Storm <[email protected]> > > --- > > > > [...] > > > > diff --git a/include/bootguard.h b/include/bootguard.h > > index 159a396..99d8fe4 100644 > > --- a/include/bootguard.h > > +++ b/include/bootguard.h > > @@ -14,20 +14,7 @@ > > > > #pragma once > > > > -#if defined(__GNUC__) > > -#define __noreturn __attribute__((noreturn)) > > -#define unreachable() __builtin_unreachable() > > -#else > > -#define __noreturn /**/ > > -#define unreachable() > > \ > > - do { \ > > - } while (1) > > -#endif > > If you pull patch 4 to the front, you can avoid this code shuffling.
Yes, true. Haven't paid attention to yield a minimal overall patch... Kind regards, Christian -- Dr. Christian Storm Siemens AG, Technology, T RDA IOT SES-DE Otto-Hahn-Ring 6, 81739 München, Germany -- You received this message because you are subscribed to the Google Groups "EFI Boot Guard" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/efibootguard-dev/20210108210258.jsu4a6vsjsn7nma7%40MD1ZFJVC.ad001.siemens.net.
