summaryrefslogtreecommitdiff
path: root/include/wchar.h
diff options
context:
space:
mode:
authorJonathan Gray <jsg@cvs.openbsd.org>2011-07-03 18:51:02 +0000
committerJonathan Gray <jsg@cvs.openbsd.org>2011-07-03 18:51:02 +0000
commitb27e467a0f3fbb2ba1e30b32a18174f170b76ef2 (patch)
tree069f384a9ef9f8857a52d9cdf82b44ad09d73aba /include/wchar.h
parent2b26c94b023e817134a575613754dbb9ecc19518 (diff)
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@
Diffstat (limited to 'include/wchar.h')
-rw-r--r--include/wchar.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/wchar.h b/include/wchar.h
index 23030ee7a3f..b590b7a8fed 100644
--- a/include/wchar.h
+++ b/include/wchar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: wchar.h,v 1.17 2011/06/01 16:39:07 millert Exp $ */
+/* $OpenBSD: wchar.h,v 1.18 2011/07/03 18:51:01 jsg Exp $ */
/* $NetBSD: wchar.h,v 1.16 2003/03/07 07:11:35 tshiozak Exp $ */
/*-
@@ -65,6 +65,8 @@
#ifndef NULL
#ifdef __GNUG__
#define NULL __null
+#elif defined(__cplusplus)
+#define NULL 0L
#else
#define NULL ((void *)0)
#endif