diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2016-02-07 18:36:13 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2016-02-07 18:36:13 +0000 |
| commit | c4f6fbdceaec2d64d6bb7dba46d91ef61c0983ca (patch) | |
| tree | ae4c2c23f880a979e356abde0b48b22eebc9d0e7 /usr/src/head/mon.h | |
| parent | a07632cea359a68576961f7b45238a6a37a82945 (diff) | |
| parent | 6d6fcbbb256ba9a8fe3e6076ae8a1f493b1f1a99 (diff) | |
| download | illumos-joyent-c4f6fbdceaec2d64d6bb7dba46d91ef61c0983ca.tar.gz | |
[illumos-gate merge]
commit 6d6fcbbb256ba9a8fe3e6076ae8a1f493b1f1a99
6600 cmd/fm should use the msgfmt(1) that Makefile.master tells it to
commit aeac2d873b68a43f6650e0d0f021c02f5a653a21
6606 pysolaris has no translations but pretends otherwise
commit f3b6506e5de00944c5a877f02a83b5e850f37ef5
6564 F_FLOCKW and F_FLOCK are undefined symbols in SPARC build
commit 238d8f47d92b5b99a374f9639e0704420d3aef77
6601 Various GLD drivers return EINVAL instead of ENOTSUP for unused mac_prop_id_t's
commit 4870e0a7381ec2ec57437062574e6ddc3dd48d7f
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
Conflicts:
usr/src/lib/Makefile
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 |