Replace NULL macro defs with null.h include

diff --git a/commands/elvis/opts.c b/commands/elvis/opts.c
index 0d72ba58dae296fd4f964d3b62ec1863cf20a55a..7552ac6fbb9b823f936e57f25259d79e7471dd10 100644 (file)
--- a/commands/elvis/opts.c
+++ b/commands/elvis/opts.c
@@ -15,9 +15,7 @@
 #include "config.h"
 #include "vi.h"
 #include "ctype.h"
-#ifndef NULL
-#define NULL (char *)0
-#endif
+#include <sys/null.h>
 extern char    *getenv();
 
 /* maximum width to permit for strings, including ="" */

diff --git a/commands/postmort/postmort.c b/commands/postmort/postmort.c
index 5246afaada27e7f7a4cbefedada4a65417cbdda3..96a3fefda524df4927a3d22541c443f80d7e5c7e 100644 (file)
--- a/commands/postmort/postmort.c
+++ b/commands/postmort/postmort.c
@@ -45,7 +45,6 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>
-#undef NULL
 #include <string.h>
 #include <unistd.h>
 

diff --git a/drivers/dec21140A/dec21140A.h b/drivers/dec21140A/dec21140A.h
index cf7ff895f97e10b6862feb4f56932e7c20f24d81..9b6778132e57bacee2a68867bf59fe94b163f224 100644 (file)
--- a/drivers/dec21140A/dec21140A.h
+++ b/drivers/dec21140A/dec21140A.h
@@ -9,11 +9,10 @@ by VirtualPC 2007
 Created: 09/01/2009   Nicolas Tittley (first.last @ gmail DOT com)
 */
 
+#include <sys/null.h>
 
 #define DE_FKEY 8  /* Shitf+ this value will dump info on console */
 
-#undef  NULL
-#define NULL ((void *)0)
 #define NOT(x) (~(x))
 
 #if debug == 1

diff --git a/drivers/dpeth/dp.h b/drivers/dpeth/dp.h
index a13c96ce0703a426c21f68fcf7d527208b194416..41c1cf074b6cd8bd4d2eba0943db9b50dc7a0acf 100644 (file)
--- a/drivers/dpeth/dp.h
+++ b/drivers/dpeth/dp.h
@@ -31,6 +31,8 @@
 **  Initial revision for Minix 3.0.6
 */
 
+#include <sys/null.h>
+
 #undef  ENABLE_3C501
 #undef  ENABLE_3C503
 #undef  ENABLE_3C509
@@ -47,8 +49,6 @@
 #define ENABLE_DP8390  (ENABLE_3C503|ENABLE_WDETH|ENABLE_NE2000)
 #define        HAVE_BUFFERS    (ENABLE_3C501|ENABLE_3C509)
 
-#undef  NULL
-#define NULL ((void *)0)
 #define NOT(x) (~(x))
 
 #if debug == 1

diff --git a/include/locale.h b/include/locale.h
index ed1d042bd5b86ac63f6a2b6cda9c858769c2c23e..d06a2def0900c0eb6b40dacc4c2f3abf23c13980 100644 (file)
--- a/include/locale.h
+++ b/include/locale.h
@@ -31,7 +31,7 @@ struct lconv {
   char n_sign_posn;            /* CHAR_MAX */
 };
 
-#define NULL    ((void *)0)
+#include <sys/null.h>
 
 #define LC_ALL             1
 #define LC_COLLATE         2

diff --git a/include/minix/const.h b/include/minix/const.h
index ce4159e30fc6326e336580ba9a64bf6459e52466..393f4b4bec67ce08c2eaf4407e92bd6059817d6a 100644 (file)
--- a/include/minix/const.h
+++ b/include/minix/const.h
@@ -44,7 +44,8 @@
 
 #define SUPER_USER ((uid_t) 0) /* uid_t of superuser */
 
-#define NULL     ((void *)0)   /* null pointer */
+#include <sys/null.h>      /* NULL Pointer */
+
 #define SCPVEC_NR        64    /* max # of entries in a SYS_VSAFECOPY* request */
 #define NR_IOREQS        64
                                /* maximum number of entries in an iorequest */

diff --git a/include/stddef.h b/include/stddef.h
index b6ab471d13270022c5a1d299b37a39003b1e2b07..bfd6e2cee96657ddd5c9a57874364fa29988687a 100644 (file)
--- a/include/stddef.h
+++ b/include/stddef.h
@@ -3,7 +3,7 @@
 #ifndef _STDDEF_H
 #define _STDDEF_H
 
-#define NULL   ((void *)0)
+#include <sys/null.h>
 
 /* The following is not portable, but the compiler accepts it. */
 #define offsetof(type, ident)  ((size_t) (unsigned long) &((type *)0)->ident)

diff --git a/include/stdio.h b/include/stdio.h
index de6dc7dcd99ae3ff7c416f348e28bee4b3a727a7..cb2f5c3a6bb613824b50e718512568f5af92e21a 100644 (file)
--- a/include/stdio.h
+++ b/include/stdio.h
@@ -13,6 +13,8 @@
 #include <ansi.h>
 #endif
 
+#include <sys/null.h>   /* For NULL */
+
 /*
  * Focus point of all stdio activity.
  */
@@ -50,7 +52,6 @@ typedef struct __iobuf {
 #define        stderr          (&__stderr)
 
 #define        BUFSIZ          4096
-#define        NULL            ((void *)0)
 #define        EOF             (-1)
 
 #define        FOPEN_MAX       20

diff --git a/include/stdlib.h b/include/stdlib.h
index c6f677afc82e4c16ee5dc3f80e37e657e9d4bde4..3d74ee6a0be52e12b96be2e82ddd70a24adb599d 100644 (file)
--- a/include/stdlib.h
+++ b/include/stdlib.h
@@ -7,8 +7,7 @@
 #include <ansi.h>
 #endif
 
-/* The macros are NULL, EXIT_FAILURE, EXIT_SUCCESS, RAND_MAX, and MB_CUR_MAX.*/
-#define NULL    ((void *)0)
+#include <sys/null.h>
 
 #define EXIT_FAILURE       1   /* standard error return using exit() */
 #define EXIT_SUCCESS       0   /* successful return using exit() */

diff --git a/include/time.h b/include/time.h
index bf9ce68a3d3f9c176e2a74877e855dcf9de9802e..75fa93b0cd8f8820571886a2878f9092c4aeda59 100644 (file)
--- a/include/time.h
+++ b/include/time.h
@@ -9,14 +9,14 @@
 #ifndef _TIME_H
 #define _TIME_H
 
+#include <sys/null.h>
+
 #define CLOCKS_PER_SEC    60
 
 #ifdef _POSIX_SOURCE
 #define CLK_TCK CLOCKS_PER_SEC /* obsolescent mame for CLOCKS_PER_SEC */
 #endif
 
-#define NULL    ((void *)0)
-
 #ifndef _SIZE_T
 #define _SIZE_T
 typedef unsigned int size_t;

diff --git a/include/unistd.h b/include/unistd.h
index 422e6d300d94166bbd06e4cfdbf504e88909c226..230df6e5c79797dfd9ec13bd623e3bc4aeb5ce02 100644 (file)
--- a/include/unistd.h
+++ b/include/unistd.h
@@ -55,7 +55,7 @@
 #define SI_PROCPUB_TAB    11   /* copy of public entries of process table */
 
 /* NULL must be defined in <unistd.h> according to POSIX Sec. 2.7.1. */
-#define NULL    ((void *)0)
+#include <sys/null.h>
 
 /* The following relate to configurable system variables. POSIX Table 4-2. */
 #define _SC_ARG_MAX       1

diff --git a/lib/libtimers/timers.h b/lib/libtimers/timers.h
index c9a38cd05c1ed75343eff4e73cefea84b07777e0..78a8833a47705806c436993badabff75ae8ecbdf 100644 (file)
--- a/lib/libtimers/timers.h
+++ b/lib/libtimers/timers.h
@@ -3,5 +3,4 @@
  */
 
 #include <timers.h>            /* definitions and function prototypes */
-#define NULL   (void *) 0      /* null-pointer definition */
-
+#include <sys/null.h>