From 7d4679eaa8b4631d0245f057c7e5f94b26b7c65a Mon Sep 17 00:00:00 2001
From: "Kaveh R. Ghazi" <ghazi@caip.rutgers.edu>
Date: Sun, 8 Feb 1998 00:48:07 +0000
Subject: [PATCH] gansidecl.h: Check for a conflicting macro definition before
 attempting to prototype bcopy...

        * gansidecl.h: Check for a conflicting macro definition before
        attempting to prototype bcopy, bcmp or bzero.

From-SVN: r17773
---
 gcc/ChangeLog   |  5 +++++
 gcc/gansidecl.h | 30 +++++++++++++++---------------
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e3e61f7e925d..fdb29ec34c13 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+Sun Feb  8 01:49:18 1998  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* gansidecl.h: Check for a conflicting macro definition before
+	attempting to prototype bcopy, bcmp or bzero.
+
 Sun Feb  8 00:09:59 1998  Jeffrey A Law  (law@cygnus.com)
 
 	* expr.c (clear_pending_stack_adjust): Handle case where a function
diff --git a/gcc/gansidecl.h b/gcc/gansidecl.h
index 83625aad4109..fff81d494e29 100644
--- a/gcc/gansidecl.h
+++ b/gcc/gansidecl.h
@@ -77,32 +77,32 @@ Boston, MA 02111-1307, USA.  */
 
 #endif /* ! __STDC__ */
 
-#ifdef HAVE_BCOPY
-# ifdef NEED_DECLARATION_BCOPY
+#ifndef bcopy
+# ifdef HAVE_BCOPY
+#  ifdef NEED_DECLARATION_BCOPY
 void bcopy ();
-# endif
-#else
-# ifndef bcopy
+#  endif
+# else
 #  define bcopy(src,dst,len) memcpy ((dst),(src),(len))
 # endif
 #endif
 
-#ifdef HAVE_BZERO
-# ifdef NEED_DECLARATION_BZERO
+#ifndef bzero
+# ifdef HAVE_BZERO
+#  ifdef NEED_DECLARATION_BZERO
 void bzero ();
-# endif
-#else
-# ifndef bzero
+#  endif
+# else
 #  define bzero(dst,len) memset ((dst),0,(len))
 # endif
 #endif
 
-#ifdef HAVE_BCMP
-# ifdef NEED_DECLARATION_BCMP
+#ifndef bcmp
+# ifdef HAVE_BCMP
+#  ifdef NEED_DECLARATION_BCMP
 int bcmp ();
-# endif
-#else
-# ifndef bcmp
+#  endif
+# else
 #  define bcmp(left,right,len) memcmp ((left),(right),(len))
 # endif
 #endif
-- 
2.43.5