summaryrefslogtreecommitdiff
path: root/include/locale.h
diff options
context:
space:
mode:
authorMarc Espie <espie@cvs.openbsd.org>1999-06-11 22:47:49 +0000
committerMarc Espie <espie@cvs.openbsd.org>1999-06-11 22:47:49 +0000
commit25018aae1e7a8c2288f61c32416e8d3c083a479f (patch)
tree1c6ccf39bfe7ab1508da3896c13a7920df0f267b /include/locale.h
parent5d30b9dd685cc89d485c7ec3f358e239e00bfe45 (diff)
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.
Diffstat (limited to 'include/locale.h')
-rw-r--r--include/locale.h6
1 files changed, 5 insertions, 1 deletions
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