commit be91aaee409591d71491bf1fbf51660d08886c2d
author njn <njn@a5019735-40e9-0310-863c-91ae7b9d1cf9> Sun Mar 27 01:42:41 2005 +0000
committer njn <njn@a5019735-40e9-0310-863c-91ae7b9d1cf9> Sun Mar 27 01:42:41 2005 +0000
tree cfc15b1a11f0650f37048c18f4a5e6121076f15e
parent 860fc631c229e2934ddd3e017dea245c2cd5c3f4

Add VG_ prefix to SKIPLIST_INIT and IS_*_ALIGNED macros.  Also pull
IS_PAGE_ALIGNED into tool.h with the others.



git-svn-id: svn://svn.valgrind.org/valgrind/trunk@3457 a5019735-40e9-0310-863c-91ae7b9d1cf9

addrcheck/ac_main.c

diff --git a/addrcheck/ac_main.c b/addrcheck/ac_main.c
index 7ed3de1..eb06979 100644
--- a/addrcheck/ac_main.c
+++ b/addrcheck/ac_main.c
@@ -246,7 +246,7 @@
    UChar   abits8;
    PROF_EVENT(24);
 #  ifdef VG_DEBUG_MEMORY
-   tl_assert(IS_4_ALIGNED(a));
+   tl_assert(VG_IS_4_ALIGNED(a));
 #  endif
    sm     = primary_map[PM_IDX(a)];
    sm_off = SM_OFF(a);
@@ -891,7 +891,7 @@
 #  else
 
    if (size == 4) {
-      if (!IS_4_ALIGNED(addr)) goto slow4;
+      if (!VG_IS_4_ALIGNED(addr)) goto slow4;
       PROF_EVENT(91);
       /* Properly aligned. */
       sm     = primary_map[PM_IDX(addr)];
@@ -906,7 +906,7 @@
    }
 
    if (size == 8) {
-      if (!IS_4_ALIGNED(addr)) goto slow8;
+      if (!VG_IS_4_ALIGNED(addr)) goto slow8;
       PROF_EVENT(92);
       /* Properly aligned.  Do it in two halves. */
       addr4 = addr + 4;
@@ -1166,7 +1166,7 @@
 Bool ac_is_valid_address ( Addr a )
 {
    UChar abits;
-   tl_assert(IS_4_ALIGNED(a));
+   tl_assert(VG_IS_4_ALIGNED(a));
    abits = get_abits4_ALIGNED(a);
    if (abits == VGM_NIBBLE_VALID) {
       return True;