Browse Source

Define NULL as a void * instead of a long integer, as required by Single Unix.

Kernel and bootblocks still use the old 0L value until all the NULL abuses
in the code are fixed.
OPENBSD_5_0
miod 13 years ago
parent
commit
3409dda593
9 changed files with 18 additions and 18 deletions
  1. +2
    -2
      src/include/dirent.h
  2. +2
    -2
      src/include/locale.h
  3. +2
    -2
      src/include/stddef.h
  4. +2
    -2
      src/include/stdio.h
  5. +2
    -2
      src/include/stdlib.h
  6. +2
    -2
      src/include/string.h
  7. +2
    -2
      src/include/time.h
  8. +2
    -2
      src/include/unistd.h
  9. +2
    -2
      src/include/wchar.h

+ 2
- 2
src/include/dirent.h View File

@ -1,4 +1,4 @@
/* $OpenBSD: dirent.h,v 1.20 2010/12/31 19:54:05 guenther Exp $ */
/* $OpenBSD: dirent.h,v 1.21 2011/04/06 11:39:42 miod 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 0L
#define NULL ((void *)0)
#endif /* __GNUG__ */
#endif /* !NULL */


+ 2
- 2
src/include/locale.h View File

@ -1,4 +1,4 @@
/* $OpenBSD: locale.h,v 1.6 2003/06/02 19:34:12 millert Exp $ */
/* $OpenBSD: locale.h,v 1.7 2011/04/06 11:39:42 miod Exp $ */
/* $NetBSD: locale.h,v 1.6 1994/10/26 00:56:02 cgd Exp $ */
/*
@ -60,7 +60,7 @@ struct lconv {
#ifdef __GNUG__
#define NULL __null
#else
#define NULL 0L
#define NULL ((void *)0)
#endif
#endif


+ 2
- 2
src/include/stddef.h View File

@ -1,4 +1,4 @@
/* $OpenBSD: stddef.h,v 1.10 2009/09/22 21:40:02 jsg Exp $ */
/* $OpenBSD: stddef.h,v 1.11 2011/04/06 11:39:42 miod Exp $ */
/* $NetBSD: stddef.h,v 1.4 1994/10/26 00:56:26 cgd Exp $ */
/*-
@ -68,7 +68,7 @@ typedef __mbstate_t mbstate_t;
#ifdef __GNUG__
#define NULL __null
#else
#define NULL 0L
#define NULL ((void *)0)
#endif
#endif


+ 2
- 2
src/include/stdio.h View File

@ -1,4 +1,4 @@
/* $OpenBSD: stdio.h,v 1.38 2009/11/09 00:18:27 kurt Exp $ */
/* $OpenBSD: stdio.h,v 1.39 2011/04/06 11:39:42 miod Exp $ */
/* $NetBSD: stdio.h,v 1.18 1996/04/25 18:29:21 jtc Exp $ */
/*-
@ -59,7 +59,7 @@ typedef __off_t off_t;
#ifdef __GNUG__
#define NULL __null
#else
#define NULL 0L
#define NULL ((void *)0)
#endif
#endif


+ 2
- 2
src/include/stdlib.h View File

@ -1,4 +1,4 @@
/* $OpenBSD: stdlib.h,v 1.47 2010/05/18 22:24:55 tedu Exp $ */
/* $OpenBSD: stdlib.h,v 1.48 2011/04/06 11:39:42 miod Exp $ */
/* $NetBSD: stdlib.h,v 1.25 1995/12/27 21:19:08 jtc Exp $ */
/*-
@ -81,7 +81,7 @@ typedef struct {
#ifdef __GNUG__
#define NULL __null
#else
#define NULL 0L
#define NULL ((void *)0)
#endif
#endif


+ 2
- 2
src/include/string.h View File

@ -1,4 +1,4 @@
/* $OpenBSD: string.h,v 1.20 2010/09/24 13:33:00 matthew Exp $ */
/* $OpenBSD: string.h,v 1.21 2011/04/06 11:39:42 miod Exp $ */
/* $NetBSD: string.h,v 1.6 1994/10/26 00:56:30 cgd Exp $ */
/*-
@ -47,7 +47,7 @@ typedef __size_t size_t;
#ifdef __GNUG__
#define NULL __null
#else
#define NULL 0L
#define NULL ((void *)0)
#endif
#endif


+ 2
- 2
src/include/time.h View File

@ -1,4 +1,4 @@
/* $OpenBSD: time.h,v 1.18 2006/01/06 18:53:04 millert Exp $ */
/* $OpenBSD: time.h,v 1.19 2011/04/06 11:39:42 miod Exp $ */
/* $NetBSD: time.h,v 1.9 1994/10/26 00:56:35 cgd Exp $ */
/*
@ -48,7 +48,7 @@
#ifdef __GNUG__
#define NULL __null
#else
#define NULL 0L
#define NULL ((void *)0)
#endif
#endif


+ 2
- 2
src/include/unistd.h View File

@ -1,4 +1,4 @@
/* $OpenBSD: unistd.h,v 1.62 2008/06/25 14:58:54 millert Exp $ */
/* $OpenBSD: unistd.h,v 1.63 2011/04/06 11:39:42 miod Exp $ */
/* $NetBSD: unistd.h,v 1.26.4.1 1996/05/28 02:31:51 mrg Exp $ */
/*-
@ -59,7 +59,7 @@
#ifdef __GNUG__
#define NULL __null
#else
#define NULL 0L
#define NULL ((void *)0)
#endif
#endif


+ 2
- 2
src/include/wchar.h View File

@ -1,4 +1,4 @@
/* $OpenBSD: wchar.h,v 1.11 2010/07/24 09:58:39 guenther Exp $ */
/* $OpenBSD: wchar.h,v 1.12 2011/04/06 11:39:42 miod Exp $ */
/* $NetBSD: wchar.h,v 1.16 2003/03/07 07:11:35 tshiozak Exp $ */
/*-
@ -66,7 +66,7 @@
#ifdef __GNUG__
#define NULL __null
#else
#define NULL 0L
#define NULL ((void *)0)
#endif
#endif


Loading…
Cancel
Save