summaryrefslogtreecommitdiff
path: root/usr/src/uts/common/sys/sysevent.h
diff options
context:
space:
mode:
authorJerry Jelinek <jerry.jelinek@joyent.com>2016-02-07 18:36:13 +0000
committerJerry Jelinek <jerry.jelinek@joyent.com>2016-02-07 18:36:13 +0000
commitc4f6fbdceaec2d64d6bb7dba46d91ef61c0983ca (patch)
treeae4c2c23f880a979e356abde0b48b22eebc9d0e7 /usr/src/uts/common/sys/sysevent.h
parenta07632cea359a68576961f7b45238a6a37a82945 (diff)
parent6d6fcbbb256ba9a8fe3e6076ae8a1f493b1f1a99 (diff)
downloadillumos-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/uts/common/sys/sysevent.h')
-rw-r--r--usr/src/uts/common/sys/sysevent.h9
1 files changed, 1 insertions, 8 deletions
diff --git a/usr/src/uts/common/sys/sysevent.h b/usr/src/uts/common/sys/sysevent.h
index 5dcaa69c6d..255e98b871 100644
--- a/usr/src/uts/common/sys/sysevent.h
+++ b/usr/src/uts/common/sys/sysevent.h
@@ -28,19 +28,12 @@
#define _SYS_SYSEVENT_H
#include <sys/nvpair.h>
+#include <sys/null.h>
#ifdef __cplusplus
extern "C" {
#endif
-#ifndef NULL
-#if defined(_LP64) && !defined(__cplusplus)
-#define NULL 0L
-#else
-#define NULL 0
-#endif
-#endif
-
/* Internal registration class and subclass */
#define EC_ALL "register_all_classes"
#define EC_SUB_ALL "register_all_subclasses"