Move NULL from tool.h into basic_types.h.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@3884

diff --git a/include/basic_types.h b/include/basic_types.h
index 6e02b3d03c18ca66dc0e6bd1c62c708331047e1b..786c3a284ec9be588c8b78ed18b3a1c7857719e6 100644 (file)
--- a/include/basic_types.h
+++ b/include/basic_types.h
@@ -61,6 +61,9 @@ typedef  Word                   OffT;     // 32             64
 /* 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 956048298295bfaa7b58974e2c42b89c1f3884e4..be561bb618a660305e2b0d4d192e825dd726fc7e 100644 (file)
--- a/include/tool.h
+++ b/include/tool.h
@@ -104,10 +104,6 @@ extern Addr VG_(get_IP) ( ThreadId tid );
 /*=== Valgrind's version of libc                                   ===*/
 /*====================================================================*/
 
-#if !defined(NULL)
-#  define NULL ((void*)0)
-#endif
-
 /* ------------------------------------------------------------------ */
 /* stdlib.h */