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/head/mon.h | |
| 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/head/mon.h')
| -rw-r--r-- | usr/src/head/mon.h | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/usr/src/head/mon.h b/usr/src/head/mon.h index 9150b7ac87..26061153b5 100644 --- a/usr/src/head/mon.h +++ b/usr/src/head/mon.h @@ -24,6 +24,7 @@ /* * Copyright 2014 Garrett D'Amore <garrett@damore.org> + * Copyright 2014 PALO, Richard. * * Copyright 1997-2003 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. @@ -32,6 +33,8 @@ #ifndef _MON_H #define _MON_H +#include <sys/null.h> + #ifdef __cplusplus extern "C" { #endif @@ -66,14 +69,6 @@ typedef unsigned short WORD; #define MPROGS0 (150 * sizeof (WORD)) /* 300 for pdp11, 600 for 32-bits */ #define MSCALE0 4 -#ifndef NULL -#if defined(_LP64) -#define NULL 0L -#else -#define NULL 0 -#endif -#endif - extern void monitor(int (*)(void), int (*)(void), WORD *, size_t, size_t); #ifdef __cplusplus |