On 1/18/21 7:38 AM, Jiaxun Yang wrote: > As per POSIX specification of limits.h [1], OS libc may define > PAGE_SIZE in limits.h. > > To prevent collosion of definition, we rename PAGE_SIZE here. > > [1]: https://pubs.opengroup.org/onlinepubs/7908799/xsh/limits.h.html > > Signed-off-by: Jiaxun Yang <jiaxun.yang@xxxxxxxxxxx> > Reviewed-by: Thomas Huth <thuth@xxxxxxxxxx> > --- > contrib/elf2dmp/addrspace.h | 6 +++--- > contrib/elf2dmp/addrspace.c | 4 ++-- > contrib/elf2dmp/main.c | 18 +++++++++--------- > 3 files changed, 14 insertions(+), 14 deletions(-) > > diff --git a/contrib/elf2dmp/addrspace.h b/contrib/elf2dmp/addrspace.h > index d87f6a18c6..00b44c1218 100644 > --- a/contrib/elf2dmp/addrspace.h > +++ b/contrib/elf2dmp/addrspace.h > @@ -10,9 +10,9 @@ > > #include "qemu_elf.h" > > -#define PAGE_BITS 12 > -#define PAGE_SIZE (1ULL << PAGE_BITS) > -#define PFN_MASK (~(PAGE_SIZE - 1)) > +#define ELF2DMP_PAGE_BITS 12 > +#define ELF2DMP_PAGE_SIZE (1ULL << ELF2DMP_PAGE_BITS) > +#define ELF2DMP_PFN_MASK (~(ELF2DMP_PAGE_SIZE - 1)) Here you renamed all definitions, better. Reviewed-by: Philippe Mathieu-Daudé <philmd@xxxxxxxxxx>
