* gansidecl.h: Check for a conflicting macro definition before

        attempting to prototype bcopy, bcmp or bzero.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@17773 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e3e61f7..fdb29ec 100644 (file)
--- 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 83625aa..fff81d4 100644 (file)
--- 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