diff options
Diffstat (limited to 'usr/src/common')
| -rw-r--r-- | usr/src/common/net/dhcp/octet.c | 4 | ||||
| -rw-r--r-- | usr/src/common/util/getoptstr.c | 5 | ||||
| -rw-r--r-- | usr/src/common/util/string.c | 5 |
3 files changed, 3 insertions, 11 deletions
diff --git a/usr/src/common/net/dhcp/octet.c b/usr/src/common/net/dhcp/octet.c index 973381b033..d8367bbf0b 100644 --- a/usr/src/common/net/dhcp/octet.c +++ b/usr/src/common/net/dhcp/octet.c @@ -24,8 +24,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* LINTLIBRARY */ #if !defined(_BOOT) && !defined(_KERNEL) @@ -34,10 +32,10 @@ #include <stdlib.h> #endif /* _BOOT && _KERNEL */ #include <sys/types.h> +#include <sys/null.h> #include <sys/errno.h> #if defined(_BOOT) || defined(_KERNEL) -#define NULL 0 #define isdigit(c) ((c) >= '0' && c <= '9') #define isxdigit(c) (isdigit(c) || (((c) >= 'a') && ((c) <= 'f')) || \ (((c) >= 'A') && ((c) <= 'F'))) diff --git a/usr/src/common/util/getoptstr.c b/usr/src/common/util/getoptstr.c index 75a16c8860..541a287058 100644 --- a/usr/src/common/util/getoptstr.c +++ b/usr/src/common/util/getoptstr.c @@ -28,8 +28,6 @@ /* All Rights Reserved */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * This file contains getoptstr(), which is getopt() for strings of arguments * (not arrays of strings). It is used by the bootloader ({*fs,inet}boot) and @@ -38,6 +36,7 @@ #include "getoptstr.h" +#include <sys/null.h> /* @@ -46,8 +45,6 @@ char *strchr(const char *s, int c); -#define NULL ((void *)0) - #define ISNTWORDCH(c) ((c) == '\0' || ISSPACE(c)) diff --git a/usr/src/common/util/string.c b/usr/src/common/util/string.c index 80a076c436..1388f5772e 100644 --- a/usr/src/common/util/string.c +++ b/usr/src/common/util/string.c @@ -31,6 +31,7 @@ */ #include <sys/types.h> +#include <sys/null.h> #include <sys/varargs.h> #if defined(_KERNEL) @@ -40,10 +41,6 @@ #include <string.h> #endif -#ifndef NULL -#define NULL 0l -#endif - #include "memcpy.h" #include "string.h" |