diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2002-11-29 22:31:42 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2002-11-29 22:31:42 +0000 |
| commit | 9a502b8156895c04573d014d760bbf75568734a0 (patch) | |
| tree | b82ada37ccab65fe0f70840a227171128ad17996 | |
| parent | ca829633d6d1dd5387d8f20985f844d364fdc74c (diff) | |
do not redefine NULL
| -rw-r--r-- | gnu/usr.bin/ld/rtld/malloc.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/gnu/usr.bin/ld/rtld/malloc.c b/gnu/usr.bin/ld/rtld/malloc.c index eb372e06090..ad1cf263fd0 100644 --- a/gnu/usr.bin/ld/rtld/malloc.c +++ b/gnu/usr.bin/ld/rtld/malloc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: malloc.c,v 1.6 2002/09/07 01:25:34 marc Exp $ */ +/* $OpenBSD: malloc.c,v 1.7 2002/11/29 22:31:41 deraadt Exp $ */ /* * Copyright (c) 1983 Regents of the University of California. @@ -35,7 +35,7 @@ #if defined(LIBC_SCCS) && !defined(lint) /*static char *sccsid = "from: @(#)malloc.c 5.11 (Berkeley) 2/23/91";*/ -static char *rcsid = "$OpenBSD: malloc.c,v 1.6 2002/09/07 01:25:34 marc Exp $"; +static char *rcsid = "$OpenBSD: malloc.c,v 1.7 2002/11/29 22:31:41 deraadt Exp $"; #endif /* LIBC_SCCS and not lint */ /* @@ -67,7 +67,9 @@ static char *rcsid = "$OpenBSD: malloc.c,v 1.6 2002/09/07 01:25:34 marc Exp $"; #define NEED_DEV_ZERO 1 #endif +#ifndef NULL #define NULL 0 +#endif /* * Pre-allocate mmap'ed pages |