diff options
| author | Richard PALO <richard@NetBSD.org> | 2016-01-27 07:05:51 +0100 |
|---|---|---|
| committer | Dan McDonald <danmcd@omniti.com> | 2016-02-05 13:35:27 -0500 |
| commit | 4870e0a7381ec2ec57437062574e6ddc3dd48d7f (patch) | |
| tree | 568fba5e7a35ab3e73daf7ba543476e0d200ec28 /usr/src/ucbhead | |
| parent | 1c0cef67dba05c477dba779bc99224693e809a14 (diff) | |
| download | illumos-joyent-4870e0a7381ec2ec57437062574e6ddc3dd48d7f.tar.gz | |
6582 initial reorg adding sys/null.h for 5218
6487 clean up __STDC__ ifdefs in rpcsvc/dbm.h
6563 fmtmsg.h should be simplified and neither define NULL nor _NULL
Reviewed by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
Reviewed by: Gary Mills <gary_mills@fastmail.fm>
Reviewed by: Robert Mustacci <rm@joyent.com>
Approved by: Dan McDonald <danmcd@omniti.com>
Diffstat (limited to 'usr/src/ucbhead')
| -rw-r--r-- | usr/src/ucbhead/dbm.h | 7 | ||||
| -rw-r--r-- | usr/src/ucbhead/stdio.h | 5 | ||||
| -rw-r--r-- | usr/src/ucbhead/sys/param.h | 8 | ||||
| -rw-r--r-- | usr/src/ucbhead/unistd.h | 3 |
4 files changed, 4 insertions, 19 deletions
diff --git a/usr/src/ucbhead/dbm.h b/usr/src/ucbhead/dbm.h index da9110584b..4cbff5d309 100644 --- a/usr/src/ucbhead/dbm.h +++ b/usr/src/ucbhead/dbm.h @@ -40,7 +40,8 @@ #ifndef _DBM_H #define _DBM_H -#pragma ident "%Z%%M% %I% %E% SMI" +#include <sys/isa_defs.h> +#include <sys/null.h> #ifdef __cplusplus extern "C" { @@ -50,10 +51,6 @@ extern "C" { #define DBLKSIZ 4096 #define BYTESIZ 8 -#ifndef NULL -#define NULL ((char *) 0) -#endif - long bitno; long maxbno; long blkno; diff --git a/usr/src/ucbhead/stdio.h b/usr/src/ucbhead/stdio.h index dd6cc3bce9..1ba873295e 100644 --- a/usr/src/ucbhead/stdio.h +++ b/usr/src/ucbhead/stdio.h @@ -48,6 +48,7 @@ #include <sys/va_list.h> #include <stdio_tag.h> #include <stdio_impl.h> +#include <sys/null.h> #ifdef __cplusplus extern "C" { @@ -77,10 +78,6 @@ typedef long ssize_t; typedef long fpos_t; -#ifndef NULL -#define NULL 0 -#endif - #define BUFSIZ 1024 #if defined(__i386) diff --git a/usr/src/ucbhead/sys/param.h b/usr/src/ucbhead/sys/param.h index dfd47aeb9d..b3927a6132 100644 --- a/usr/src/ucbhead/sys/param.h +++ b/usr/src/ucbhead/sys/param.h @@ -40,8 +40,6 @@ #ifndef _SYS_PARAM_H #define _SYS_PARAM_H -#pragma ident "%Z%%M% %I% %E% SMI" - /* * Fundamental variables; don't change too often. @@ -128,12 +126,6 @@ extern "C" { #define NBPS 0x20000 /* Number of bytes per segment */ #define NBPW sizeof (int) /* number of bytes in an integer */ -#if defined(_LP64) && !defined(__cplusplus) -#define NULL 0L -#else -#define NULL 0 -#endif - #define CMASK 0 /* default mask for file creation */ #define CDLIMIT (1L<<11) /* default max write address */ #define NODEV (dev_t)(-1) diff --git a/usr/src/ucbhead/unistd.h b/usr/src/ucbhead/unistd.h index 420e070285..a527305094 100644 --- a/usr/src/ucbhead/unistd.h +++ b/usr/src/ucbhead/unistd.h @@ -40,9 +40,8 @@ #ifndef _UNISTD_H #define _UNISTD_H -#pragma ident "%Z%%M% %I% %E% SMI" - #include <sys/fcntl.h> +#include <sys/null.h> #ifdef __cplusplus extern "C" { |