Merge the DARWIN branch onto the trunk.
I tried using 'svn merge' to do the merge but it did a terrible job and
there were bazillions of conflicts. So instead I just took the diff between
the branch and trunk at r10155, applied the diff to the trunk, 'svn add'ed
the added files (no files needed to be 'svn remove'd) and committed.
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@10156 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/memcheck/tests/memalign2.c b/memcheck/tests/memalign2.c
index e163bf4..a3aacfe 100644
--- a/memcheck/tests/memalign2.c
+++ b/memcheck/tests/memalign2.c
@@ -22,6 +22,9 @@
# if defined(VGO_aix5)
// AIX 5.2 has neither memalign() nor posix_memalign(); do nothing.
+# elif defined(VGO_darwin)
+ // Likewise for Mac OS X.
+
# else
// Nb: assuming VG_MIN_MALLOC_SZB is 8 or more...
int* p;