Browse Source

Be thorough about NULL as __null for C++.

OPENBSD_2_6
espie 25 years ago
parent
commit
f851e80d96
5 changed files with 16 additions and 8 deletions
  1. +2
    -2
      src/include/dirent.h
  2. +5
    -1
      src/include/stdio.h
  3. +5
    -1
      src/include/string.h
  4. +2
    -2
      src/include/time.h
  5. +2
    -2
      src/include/unistd.h

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

@ -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 $ */ /* $NetBSD: dirent.h,v 1.9 1995/03/26 20:13:37 jtc Exp $ */
/*- /*-
@ -83,7 +83,7 @@ typedef struct _dirdesc {
#ifndef NULL #ifndef NULL
#ifdef __GNUG__ #ifdef __GNUG__
#define NULL __null
#define NULL __null
#else #else
#define NULL 0 #define NULL 0
#endif #endif


+ 5
- 1
src/include/stdio.h View File

@ -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 $ */ /* $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 #endif
#ifndef NULL #ifndef NULL
#ifdef __GNUG__
#define NULL __null
#else
#define NULL 0 #define NULL 0
#endif #endif
#endif
/* /*
* This is fairly grotesque, but pure ANSI code must not inspect the * This is fairly grotesque, but pure ANSI code must not inspect the


+ 5
- 1
src/include/string.h View File

@ -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 $ */ /* $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 #endif
#ifndef NULL #ifndef NULL
#ifdef __GNUG__
#define NULL __null
#else
#define NULL 0 #define NULL 0
#endif #endif
#endif
#include <sys/cdefs.h> #include <sys/cdefs.h>


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

@ -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 $ */ /* $NetBSD: time.h,v 1.9 1994/10/26 00:56:35 cgd Exp $ */
/* /*
@ -49,7 +49,7 @@
#ifndef NULL #ifndef NULL
#ifdef __GNUG__ #ifdef __GNUG__
#define NULL __null
#define NULL __null
#else #else
#define NULL 0 #define NULL 0
#endif #endif


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

@ -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 $ */ /* $NetBSD: unistd.h,v 1.26.4.1 1996/05/28 02:31:51 mrg Exp $ */
/*- /*-
@ -49,7 +49,7 @@
#ifndef NULL #ifndef NULL
#ifdef __GNUG__ #ifdef __GNUG__
#define NULL __null
#define NULL __null
#else #else
#define NULL 0 /* null pointer constant */ #define NULL 0 /* null pointer constant */
#endif #endif


Loading…
Cancel
Save