From 9a61bb23a66308f361503ab3dd7c6cec0894dd54 Mon Sep 17 00:00:00 2001 From: millert <> Date: Fri, 25 Oct 2002 21:55:28 +0000 Subject: [PATCH] NULL is now 0L so it is the same size as a pointer. OK mickey@ and discussed with deraadt@ --- src/include/dirent.h | 4 ++-- src/include/locale.h | 4 ++-- src/include/stddef.h | 4 ++-- src/include/stdio.h | 4 ++-- src/include/stdlib.h | 4 ++-- src/include/string.h | 4 ++-- src/include/time.h | 4 ++-- src/include/unistd.h | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/include/dirent.h b/src/include/dirent.h index 45392a7d..8884da63 100644 --- a/src/include/dirent.h +++ b/src/include/dirent.h @@ -1,4 +1,4 @@ -/* $OpenBSD: dirent.h,v 1.8 2002/02/17 19:42:21 millert Exp $ */ +/* $OpenBSD: dirent.h,v 1.9 2002/10/25 21:55:28 millert Exp $ */ /* $NetBSD: dirent.h,v 1.9 1995/03/26 20:13:37 jtc Exp $ */ /*- @@ -85,7 +85,7 @@ typedef struct _dirdesc { #ifdef __GNUG__ #define NULL __null #else -#define NULL 0 +#define NULL 0L #endif #endif diff --git a/src/include/locale.h b/src/include/locale.h index 4bd430b6..cf389b76 100644 --- a/src/include/locale.h +++ b/src/include/locale.h @@ -1,4 +1,4 @@ -/* $OpenBSD: locale.h,v 1.4 2002/02/16 21:27:17 millert Exp $ */ +/* $OpenBSD: locale.h,v 1.5 2002/10/25 21:55:28 millert Exp $ */ /* $NetBSD: locale.h,v 1.6 1994/10/26 00:56:02 cgd Exp $ */ /* @@ -64,7 +64,7 @@ struct lconv { #ifdef __GNUG__ #define NULL __null #else -#define NULL 0 +#define NULL 0L #endif #endif diff --git a/src/include/stddef.h b/src/include/stddef.h index c9eaaa21..dc6f500b 100644 --- a/src/include/stddef.h +++ b/src/include/stddef.h @@ -1,4 +1,4 @@ -/* $OpenBSD: stddef.h,v 1.4 1999/11/27 13:20:25 espie Exp $ */ +/* $OpenBSD: stddef.h,v 1.5 2002/10/25 21:55:28 millert Exp $ */ /* $NetBSD: stddef.h,v 1.4 1994/10/26 00:56:26 cgd Exp $ */ /*- @@ -60,7 +60,7 @@ typedef _BSD_WCHAR_T_ wchar_t; #ifdef __GNUG__ #define NULL __null #else -#define NULL 0 +#define NULL 0L #endif #endif diff --git a/src/include/stdio.h b/src/include/stdio.h index 7918650e..d2a62bc6 100644 --- a/src/include/stdio.h +++ b/src/include/stdio.h @@ -1,4 +1,4 @@ -/* $OpenBSD: stdio.h,v 1.22 2002/02/19 19:39:36 millert Exp $ */ +/* $OpenBSD: stdio.h,v 1.23 2002/10/25 21:55:28 millert Exp $ */ /* $NetBSD: stdio.h,v 1.18 1996/04/25 18:29:21 jtc Exp $ */ /*- @@ -63,7 +63,7 @@ typedef _BSD_OFF_T_ off_t; #ifdef __GNUG__ #define NULL __null #else -#define NULL 0 +#define NULL 0L #endif #endif diff --git a/src/include/stdlib.h b/src/include/stdlib.h index f6c322a4..71c22af6 100644 --- a/src/include/stdlib.h +++ b/src/include/stdlib.h @@ -1,4 +1,4 @@ -/* $OpenBSD: stdlib.h,v 1.20 2002/06/29 00:20:11 millert Exp $ */ +/* $OpenBSD: stdlib.h,v 1.21 2002/10/25 21:55:28 millert Exp $ */ /* $NetBSD: stdlib.h,v 1.25 1995/12/27 21:19:08 jtc Exp $ */ /*- @@ -79,7 +79,7 @@ typedef struct { #ifdef __GNUG__ #define NULL __null #else -#define NULL 0 +#define NULL 0L #endif #endif diff --git a/src/include/string.h b/src/include/string.h index af469e99..3f32aed4 100644 --- a/src/include/string.h +++ b/src/include/string.h @@ -1,4 +1,4 @@ -/* $OpenBSD: string.h,v 1.7 2002/02/16 21:27:17 millert Exp $ */ +/* $OpenBSD: string.h,v 1.8 2002/10/25 21:55:28 millert Exp $ */ /* $NetBSD: string.h,v 1.6 1994/10/26 00:56:30 cgd Exp $ */ /*- @@ -49,7 +49,7 @@ typedef _BSD_SIZE_T_ size_t; #ifdef __GNUG__ #define NULL __null #else -#define NULL 0 +#define NULL 0L #endif #endif diff --git a/src/include/time.h b/src/include/time.h index 9ba1a60d..9bdc239f 100644 --- a/src/include/time.h +++ b/src/include/time.h @@ -1,4 +1,4 @@ -/* $OpenBSD: time.h,v 1.11 2002/02/16 21:27:17 millert Exp $ */ +/* $OpenBSD: time.h,v 1.12 2002/10/25 21:55:28 millert Exp $ */ /* $NetBSD: time.h,v 1.9 1994/10/26 00:56:35 cgd Exp $ */ /* @@ -51,7 +51,7 @@ #ifdef __GNUG__ #define NULL __null #else -#define NULL 0 +#define NULL 0L #endif #endif diff --git a/src/include/unistd.h b/src/include/unistd.h index 20297b80..a8305e4e 100644 --- a/src/include/unistd.h +++ b/src/include/unistd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: unistd.h,v 1.42 2002/09/17 21:15:58 deraadt Exp $ */ +/* $OpenBSD: unistd.h,v 1.43 2002/10/25 21:55:28 millert Exp $ */ /* $NetBSD: unistd.h,v 1.26.4.1 1996/05/28 02:31:51 mrg Exp $ */ /*- @@ -51,7 +51,7 @@ #ifdef __GNUG__ #define NULL __null #else -#define NULL 0 /* null pointer constant */ +#define NULL 0L #endif #endif