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

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index b8aea25e4d820422c0e08ef84f4159ce99f5dfa1..c45d51c9621bc3b3521d1dd716d9784efabc2eb1 100644 (file)
--- 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 e205719832b9fb2be782c1c23472a83291fe657b..0a950709fceb8714c4e209552bc2e8def3fb2965 100644 (file)
--- 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