Move NULL from tool.h into basic_types.h.
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@3884 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/include/basic_types.h b/include/basic_types.h
index 6e02b3d..786c3a2 100644
--- a/include/basic_types.h
+++ b/include/basic_types.h
@@ -61,6 +61,9 @@
/* This is going to be either 4 or 8. */
#define VG_WORDSIZE VEX_HOST_WORDSIZE
+#if !defined(NULL)
+# define NULL ((void*)0)
+#endif
/* ---------------------------------------------------------------------
non-builtin types
diff --git a/include/tool.h b/include/tool.h
index 9560482..be561bb 100644
--- a/include/tool.h
+++ b/include/tool.h
@@ -104,10 +104,6 @@
/*=== Valgrind's version of libc ===*/
/*====================================================================*/
-#if !defined(NULL)
-# define NULL ((void*)0)
-#endif
-
/* ------------------------------------------------------------------ */
/* stdlib.h */