From 493ea1571411723d8301099a5f8fda4d0588a727 Mon Sep 17 00:00:00 2001 From: Ben Gras Date: Wed, 2 Mar 2011 16:05:59 +0000 Subject: [PATCH] rename aligned() macro to _minix_aligned --- include/arch/i386/param.h | 2 +- lib/libexec/exec_elf.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/arch/i386/param.h b/include/arch/i386/param.h index fbcaeb753..7db972739 100644 --- a/include/arch/i386/param.h +++ b/include/arch/i386/param.h @@ -105,6 +105,6 @@ #define trunc_page_ps(va, ps) ((va) & ~(ps - 1)) #define round_page_ps(va, ps) (((va) + (ps - 1)) & ~(ps - 1)) -#define aligned(a, t) (trunc_page_ps((u_long)(a), sizeof(t)) == (u_long)(a)) +#define _minix_aligned(a, t) (trunc_page_ps((u_long)(a), sizeof(t)) == (u_long)(a)) #endif /* !_I386_INCLUDE_PARAM_H_ */ diff --git a/lib/libexec/exec_elf.c b/lib/libexec/exec_elf.c index b79a712bc..055cedd69 100644 --- a/lib/libexec/exec_elf.c +++ b/lib/libexec/exec_elf.c @@ -53,7 +53,7 @@ int read_header_elf( } phdr = (const Elf_Phdr *)(exec_hdr + hdr->e_phoff); - if (!aligned(phdr, Elf_Addr)) { + if (!_minix_aligned(phdr, Elf_Addr)) { return ENOEXEC; }