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/include/pub_tool_vki.h b/include/pub_tool_vki.h
index 75da646..f6c9792 100644
--- a/include/pub_tool_vki.h
+++ b/include/pub_tool_vki.h
@@ -51,6 +51,8 @@
# include "vki/vki-ppc32-aix5.h"
#elif defined(VGP_ppc64_aix5)
# include "vki/vki-ppc64-aix5.h"
+#elif defined(VGO_darwin)
+# include "vki/vki-darwin.h"
#else
# error Unknown Plat/OS
#endif