aboutsummaryrefslogtreecommitdiff
path: root/libiberty
diff options
context:
space:
mode:
authorMichael Meissner <meissner@cygnus.com>1999-01-13 21:38:14 +0000
committerJeff Law <law@gcc.gnu.org>1999-01-13 14:38:14 -0700
commitfb9939b8f815bdcbe930d375f30e6fed8b29c5ce (patch)
tree7ad3358cbdf418b72868602b67f1871ccd856af4 /libiberty
parent58a2f534eedcf29002ac2f5f643f9573b63eeb0b (diff)
downloadgcc-fb9939b8f815bdcbe930d375f30e6fed8b29c5ce.zip
gcc-fb9939b8f815bdcbe930d375f30e6fed8b29c5ce.tar.gz
gcc-fb9939b8f815bdcbe930d375f30e6fed8b29c5ce.tar.bz2
random.c (NULL): Don't redefine NULL if it is already defined.
1998-12-30 Michael Meissner <meissner@cygnus.com> * random.c (NULL): Don't redefine NULL if it is already defined. From-SVN: r24659
Diffstat (limited to 'libiberty')
-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 b8aea25..c45d51c 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 e205719..0a95070 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