From: Ben Gras <ben@minix3.org>
Date: Wed, 2 Mar 2011 16:05:59 +0000 (+0000)
Subject: rename aligned() macro to _minix_aligned
X-Git-Tag: v3.2.0~625
X-Git-Url: http://zhaoyanbai.com/repos/%22http:/www.isc.org/icons/doxygen.log?a=commitdiff_plain;h=493ea1571411723d8301099a5f8fda4d0588a727;p=minix.git

rename aligned() macro to _minix_aligned
---

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;
   }