diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 1999-09-17 13:13:47 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 1999-09-17 13:13:47 +0000 |
| commit | ba903d4dd684a871a55c21d616e2dcfab110e3c9 (patch) | |
| tree | d148e1b9a1f4965b61455b435c4c504bcfa388a0 /include | |
| parent | 418794422a4be5adcc1087a5a660eb20e35a3adf (diff) | |
Be thorough about NULL as __null for C++.
Diffstat (limited to 'include')
| -rw-r--r-- | include/dirent.h | 4 | ||||
| -rw-r--r-- | include/stdio.h | 6 | ||||
| -rw-r--r-- | include/string.h | 6 | ||||
| -rw-r--r-- | include/time.h | 4 | ||||
| -rw-r--r-- | include/unistd.h | 4 |
5 files changed, 16 insertions, 8 deletions
diff --git a/include/dirent.h b/include/dirent.h index 89718362331..54291f535a1 100644 --- a/include/dirent.h +++ b/include/dirent.h @@ -1,4 +1,4 @@ -/* $OpenBSD: dirent.h,v 1.5 1999/06/11 22:47:48 espie Exp $ */ +/* $OpenBSD: dirent.h,v 1.6 1999/09/17 13:13:46 espie Exp $ */ /* $NetBSD: dirent.h,v 1.9 1995/03/26 20:13:37 jtc Exp $ */ /*- @@ -83,7 +83,7 @@ typedef struct _dirdesc { #ifndef NULL #ifdef __GNUG__ -#define NULL __null +#define NULL __null #else #define NULL 0 #endif diff --git a/include/stdio.h b/include/stdio.h index ed1fb32c7dd..50e0987e381 100644 --- a/include/stdio.h +++ b/include/stdio.h @@ -1,4 +1,4 @@ -/* $OpenBSD: stdio.h,v 1.10 1998/11/20 11:18:26 d Exp $ */ +/* $OpenBSD: stdio.h,v 1.11 1999/09/17 13:13:46 espie Exp $ */ /* $NetBSD: stdio.h,v 1.18 1996/04/25 18:29:21 jtc Exp $ */ /*- @@ -55,8 +55,12 @@ typedef _BSD_SIZE_T_ size_t; #endif #ifndef NULL +#ifdef __GNUG__ +#define NULL __null +#else #define NULL 0 #endif +#endif /* * This is fairly grotesque, but pure ANSI code must not inspect the diff --git a/include/string.h b/include/string.h index d170174f80e..7be111260a7 100644 --- a/include/string.h +++ b/include/string.h @@ -1,4 +1,4 @@ -/* $OpenBSD: string.h,v 1.5 1998/11/20 11:18:26 d Exp $ */ +/* $OpenBSD: string.h,v 1.6 1999/09/17 13:13:46 espie Exp $ */ /* $NetBSD: string.h,v 1.6 1994/10/26 00:56:30 cgd Exp $ */ /*- @@ -46,8 +46,12 @@ typedef _BSD_SIZE_T_ size_t; #endif #ifndef NULL +#ifdef __GNUG__ +#define NULL __null +#else #define NULL 0 #endif +#endif #include <sys/cdefs.h> diff --git a/include/time.h b/include/time.h index b1754e83b76..e4c39e43a75 100644 --- a/include/time.h +++ b/include/time.h @@ -1,4 +1,4 @@ -/* $OpenBSD: time.h,v 1.7 1999/06/11 22:47:48 espie Exp $ */ +/* $OpenBSD: time.h,v 1.8 1999/09/17 13:13:46 espie Exp $ */ /* $NetBSD: time.h,v 1.9 1994/10/26 00:56:35 cgd Exp $ */ /* @@ -49,7 +49,7 @@ #ifndef NULL #ifdef __GNUG__ -#define NULL __null +#define NULL __null #else #define NULL 0 #endif diff --git a/include/unistd.h b/include/unistd.h index 449295d9b09..e2d017ab15a 100644 --- a/include/unistd.h +++ b/include/unistd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: unistd.h,v 1.26 1999/06/11 22:47:47 espie Exp $ */ +/* $OpenBSD: unistd.h,v 1.27 1999/09/17 13:13:46 espie Exp $ */ /* $NetBSD: unistd.h,v 1.26.4.1 1996/05/28 02:31:51 mrg Exp $ */ /*- @@ -49,7 +49,7 @@ #ifndef NULL #ifdef __GNUG__ -#define NULL __null +#define NULL __null #else #define NULL 0 /* null pointer constant */ #endif |