diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 2016-09-09 18:12:38 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 2016-09-09 18:12:38 +0000 |
| commit | 25fbe837102197e671c7fff2204cced3153d7861 (patch) | |
| tree | b130c345c40148b9b05844117ae8642e1bdc09ea /include/wchar.h | |
| parent | c3304e434d26f042ef8e1e6d4309657e6aff0164 (diff) | |
Move the 10 (!) defintions of NULL to their own mini header file and
update the NULL definition for C++11. OK deraadt@ guenther@ kettenis@
Diffstat (limited to 'include/wchar.h')
| -rw-r--r-- | include/wchar.h | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/include/wchar.h b/include/wchar.h index 270bd6c6f78..7cdee59a0b8 100644 --- a/include/wchar.h +++ b/include/wchar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: wchar.h,v 1.29 2015/04/04 18:05:05 guenther Exp $ */ +/* $OpenBSD: wchar.h,v 1.30 2016/09/09 18:12:37 millert Exp $ */ /* $NetBSD: wchar.h,v 1.16 2003/03/07 07:11:35 tshiozak Exp $ */ /*- @@ -60,18 +60,9 @@ #define _WCHAR_H_ #include <sys/cdefs.h> +#include <sys/_null.h> #include <sys/_types.h> -#ifndef NULL -#ifdef __GNUG__ -#define NULL __null -#elif defined(__cplusplus) -#define NULL 0L -#else -#define NULL ((void *)0) -#endif -#endif - #include <stdio.h> /* for FILE* */ #if !defined(_WCHAR_T_DEFINED_) && !defined(__cplusplus) |