LGTM Reviewed-by: Vladimir Serbinenko <phco...@gmail.com> On Tue, Jan 16, 2024 at 12:22 PM Gary Lin via Grub-devel <grub-devel@gnu.org> wrote: > > From: Daniel Axtens <d...@axtens.net> > > - Define SIZEOF_UNSIGNED_LONG_INT, it's the same as > SIZEOF_UNSIGNED_LONG. > > - Define WORD_BIT, the size in bits of an int. This is a defined > in the Single Unix Specification and in gnulib's limits.h. gnulib > assumes it's 32 bits on all our platforms, including 64 bit > platforms, so we also use that value. > > - Provide strto[u]l[l] preprocessor macros that resolve to > grub_strto[u]l[l]. To avoid gcrypt redefining strtoul, we > also define HAVE_STRTOUL here. > > Signed-off-by: Daniel Axtens <d...@axtens.net> > Signed-off-by: Gary Lin <g...@suse.com> > --- > grub-core/lib/posix_wrap/limits.h | 1 + > grub-core/lib/posix_wrap/stdlib.h | 8 ++++++++ > grub-core/lib/posix_wrap/sys/types.h | 1 + > 3 files changed, 10 insertions(+) > > diff --git a/grub-core/lib/posix_wrap/limits.h > b/grub-core/lib/posix_wrap/limits.h > index 26918c8a0..4be7b4080 100644 > --- a/grub-core/lib/posix_wrap/limits.h > +++ b/grub-core/lib/posix_wrap/limits.h > @@ -41,5 +41,6 @@ > #define LONG_MAX GRUB_LONG_MAX > > #define CHAR_BIT 8 > +#define WORD_BIT 32 > > #endif > diff --git a/grub-core/lib/posix_wrap/stdlib.h > b/grub-core/lib/posix_wrap/stdlib.h > index f5279756a..14e4efdd0 100644 > --- a/grub-core/lib/posix_wrap/stdlib.h > +++ b/grub-core/lib/posix_wrap/stdlib.h > @@ -64,4 +64,12 @@ abort (void) > grub_abort (); > } > > +#define strtol grub_strtol > + > +/* for libgcrypt */ > +#define HAVE_STRTOUL > +#define strtoul grub_strtoul > + > +#define strtoull grub_strtoull > + > #endif > diff --git a/grub-core/lib/posix_wrap/sys/types.h > b/grub-core/lib/posix_wrap/sys/types.h > index eeda543c4..2f3e86549 100644 > --- a/grub-core/lib/posix_wrap/sys/types.h > +++ b/grub-core/lib/posix_wrap/sys/types.h > @@ -50,6 +50,7 @@ typedef grub_uint8_t byte; > typedef grub_addr_t uintptr_t; > > #define SIZEOF_UNSIGNED_LONG GRUB_CPU_SIZEOF_LONG > +#define SIZEOF_UNSIGNED_LONG_INT GRUB_CPU_SIZEOF_LONG > #define SIZEOF_UNSIGNED_INT 4 > #define SIZEOF_UNSIGNED_LONG_LONG 8 > #define SIZEOF_UNSIGNED_SHORT 2 > -- > 2.35.3 > > > _______________________________________________ > Grub-devel mailing list > Grub-devel@gnu.org > https://lists.gnu.org/mailman/listinfo/grub-devel
-- Regards Vladimir 'phcoder' Serbinenko _______________________________________________ Grub-devel mailing list Grub-devel@gnu.org https://lists.gnu.org/mailman/listinfo/grub-devel
