From: Nicholas Nethercote Date: Sat, 11 Jun 2005 04:44:38 +0000 (+0000) Subject: Move NULL from tool.h into basic_types.h. X-Git-Tag: svn/VALGRIND_3_0_0~434 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0622471f7b022fde7b3b5f64e8d58ad7b3dbb0be;p=thirdparty%2Fvalgrind.git 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 6e02b3d03c..786c3a284e 100644 --- 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 9560482982..be561bb618 100644 --- 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 */