From 25018aae1e7a8c2288f61c32416e8d3c083a479f Mon Sep 17 00:00:00 2001
From: Marc Espie <espie@cvs.openbsd.org>
Date: Fri, 11 Jun 1999 22:47:49 +0000
Subject: Define NULL to be __null for C++: better quality of implementation.
 __null is a magic constant of integral type that converts to a null pointer
 as should be, but warns for ambiguity when used to resolved an overload
 between an integral type and a pointer type.

---
 include/locale.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'include/locale.h')

diff --git a/include/locale.h b/include/locale.h
index 211b4dbb4be..5644acbd193 100644
--- a/include/locale.h
+++ b/include/locale.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: locale.h,v 1.2 1997/09/21 10:45:41 niklas Exp $	*/
+/*	$OpenBSD: locale.h,v 1.3 1999/06/11 22:47:48 espie Exp $	*/
 /*	$NetBSD: locale.h,v 1.6 1994/10/26 00:56:02 cgd Exp $	*/
 
 /*
@@ -61,8 +61,12 @@ struct lconv {
 };
 
 #ifndef NULL
+#ifdef 	__GNUG__
+#define NULL	__null
+#else
 #define	NULL	0
 #endif
+#endif
 
 #define	LC_ALL		0
 #define	LC_COLLATE	1
-- 
cgit v1.2.3