From 4870e0a7381ec2ec57437062574e6ddc3dd48d7f Mon Sep 17 00:00:00 2001
From: Richard PALO <richard@NetBSD.org>
Date: Wed, 27 Jan 2016 07:05:51 +0100
Subject: 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>

---
 usr/src/head/iso/stdio_iso.h | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

(limited to 'usr/src/head/iso/stdio_iso.h')

diff --git a/usr/src/head/iso/stdio_iso.h b/usr/src/head/iso/stdio_iso.h
index 1dec847790..d09c982a9c 100644
--- a/usr/src/head/iso/stdio_iso.h
+++ b/usr/src/head/iso/stdio_iso.h
@@ -21,6 +21,7 @@
  */
 /*
  * Copyright 2014 Garrett D'Amore <garrett@damore.org>
+ * Copyright 2014 PALO, Richard.
  *
  * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
@@ -49,6 +50,7 @@
 #define	_ISO_STDIO_ISO_H
 
 #include <sys/feature_tests.h>
+#include <sys/null.h>
 #include <sys/va_list.h>
 #include <stdio_tag.h>
 #include <stdio_impl.h>
@@ -110,14 +112,6 @@ typedef	__longlong_t	fpos_t;
 }
 #endif /* end of namespace std */
 
-#ifndef	NULL
-#if defined(_LP64)
-#define	NULL	0L
-#else
-#define	NULL	0
-#endif
-#endif
-
 #define	BUFSIZ	1024
 
 /*
-- 
cgit v1.2.3