diff options
| author |   millert <millert@openbsd.org> | 2016-09-09 18:12:37 +0000 |
|---|---|---|
| committer | millert <millert@openbsd.org> | 2016-09-09 18:12:37 +0000 |
| commit | 6ecde746dea9a5d17abf3bafa06c232b9189b33b (patch) | |
| tree | 812f2642986566934fc2132bc1718f2b10bfbdab /include/time.h | |
| parent | Convert [] to ksh style [[]] tests. (diff) | |
| download | wireguard-openbsd-6ecde746dea9a5d17abf3bafa06c232b9189b33b.tar.xz wireguard-openbsd-6ecde746dea9a5d17abf3bafa06c232b9189b33b.zip | |
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/time.h')
| -rw-r--r-- | include/time.h | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/include/time.h b/include/time.h index 8c432b06097..a73f9c3a6cc 100644 --- a/include/time.h +++ b/include/time.h @@ -1,4 +1,4 @@ -/* $OpenBSD: time.h,v 1.28 2015/04/07 01:47:04 millert Exp $ */ +/* $OpenBSD: time.h,v 1.29 2016/09/09 18:12:37 millert Exp $ */ /* $NetBSD: time.h,v 1.9 1994/10/26 00:56:35 cgd Exp $ */ /* @@ -42,18 +42,9 @@ #define _TIME_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 - #ifndef _CLOCK_T_DEFINED_ #define _CLOCK_T_DEFINED_ typedef __clock_t clock_t; |