summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libiberty/ChangeLog4
-rw-r--r--libiberty/random.c8
2 files changed, 10 insertions, 2 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index b8aea25e4d8..c45d51c9621 100644
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -2,6 +2,10 @@ Wed Jan 13 14:16:36 1999 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
* xstrdup.c (xstrdup): Switch from strcpy to memcpy for speed.
+1998-12-30 Michael Meissner <meissner@cygnus.com>
+
+ * random.c (NULL): Don't redefine NULL if it is already defined.
+
Tue Dec 22 09:43:35 1998 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
* argv.c (buildargv): Cast the result of alloca in assignment.
diff --git a/libiberty/random.c b/libiberty/random.c
index e205719832b..0a950709fce 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