rename aligned() macro to _minix_aligned

diff --git a/include/arch/i386/param.h b/include/arch/i386/param.h
index fbcaeb7531e6c5b9177b1e1a3014329a0181a1bf..7db9727392dce3836a70333b920c6cf67a7ad992 100644 (file)
--- 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 b79a712bc75d75c273fd22e809a5352a6ee2a69d..055cedd695e827403dde83d6da35490f00f5c0a7 100644 (file)
--- 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;
   }