diff options
Diffstat (limited to 'include/string.h')
| -rw-r--r-- | include/string.h | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/include/string.h b/include/string.h index 412220819a8..b4c880ce3ac 100644 --- a/include/string.h +++ b/include/string.h @@ -1,4 +1,4 @@ -/* $OpenBSD: string.h,v 1.30 2015/11/20 23:40:32 millert Exp $ */ +/* $OpenBSD: string.h,v 1.31 2016/09/09 18:12:37 millert Exp $ */ /* $NetBSD: string.h,v 1.6 1994/10/26 00:56:30 cgd Exp $ */ /*- @@ -36,6 +36,7 @@ #define _STRING_H_ #include <sys/cdefs.h> +#include <sys/_null.h> #include <machine/_types.h> /* @@ -51,16 +52,6 @@ typedef __size_t size_t; #endif -#ifndef NULL -#ifdef __GNUG__ -#define NULL __null -#elif defined(__cplusplus) -#define NULL 0L -#else -#define NULL ((void *)0) -#endif -#endif - __BEGIN_DECLS void *memchr(const void *, int, size_t); int memcmp(const void *, const void *, size_t); |