From fb9939b8f815bdcbe930d375f30e6fed8b29c5ce Mon Sep 17 00:00:00 2001 From: Michael Meissner Date: Wed, 13 Jan 1999 21:38:14 +0000 Subject: [PATCH] random.c (NULL): Don't redefine NULL if it is already defined. 1998-12-30 Michael Meissner * random.c (NULL): Don't redefine NULL if it is already defined. From-SVN: r24659 --- libiberty/ChangeLog | 4 ++++ libiberty/random.c | 8 ++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index b8aea25e4d82..c45d51c9621b 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -2,6 +2,10 @@ Wed Jan 13 14:16:36 1999 Kaveh R. Ghazi * xstrdup.c (xstrdup): Switch from strcpy to memcpy for speed. +1998-12-30 Michael Meissner + + * random.c (NULL): Don't redefine NULL if it is already defined. + Tue Dec 22 09:43:35 1998 Kaveh R. Ghazi * argv.c (buildargv): Cast the result of alloca in assignment. diff --git a/libiberty/random.c b/libiberty/random.c index e205719832b9..0a950709fceb 100644 --- a/libiberty/random.c +++ b/libiberty/random.c @@ -37,10 +37,14 @@ #ifdef __STDC__ # define PTR void * -# define NULL (void *) 0 +# ifndef NULL +# define NULL (void *) 0 +# endif #else # define PTR char * -# define NULL 0 +# ifndef NULL +# define NULL (void *) 0 +# endif #endif #endif