From b27e467a0f3fbb2ba1e30b32a18174f170b76ef2 Mon Sep 17 00:00:00 2001
From: Jonathan Gray <jsg@cvs.openbsd.org>
Date: Sun, 3 Jul 2011 18:51:02 +0000
Subject: As pointed out by Richard Guenther our definition of NULL was
 incorrect for c++ compilers that aren't gcc (or pretend to be gcc like
 clang).

ok miod@
---
 include/string.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'include/string.h')

diff --git a/include/string.h b/include/string.h
index f3ae14e15c2..3e754a83bc2 100644
--- a/include/string.h
+++ b/include/string.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: string.h,v 1.21 2011/04/06 11:39:42 miod Exp $	*/
+/*	$OpenBSD: string.h,v 1.22 2011/07/03 18:51:01 jsg Exp $	*/
 /*	$NetBSD: string.h,v 1.6 1994/10/26 00:56:30 cgd Exp $	*/
 
 /*-
@@ -46,6 +46,8 @@ typedef	__size_t	size_t;
 #ifndef	NULL
 #ifdef 	__GNUG__
 #define	NULL	__null
+#elif defined(__cplusplus)
+#define	NULL	0L
 #else
 #define	NULL	((void *)0)
 #endif
-- 
cgit v1.2.3