diff options
author | Kaveh R. Ghazi <ghazi@caip.rutgers.edu> | 1998-02-08 00:48:07 +0000 |
---|---|---|
committer | Jeff Law <law@gcc.gnu.org> | 1998-02-07 17:48:07 -0700 |
commit | 7d4679eaa8b4631d0245f057c7e5f94b26b7c65a (patch) | |
tree | 5edd6d52aaf0c212347262406be9ddd9febab4c4 /gcc | |
parent | e93e582cb7a4ba6b81c4ff54209d160649a8fced (diff) | |
download | gcc-7d4679eaa8b4631d0245f057c7e5f94b26b7c65a.zip gcc-7d4679eaa8b4631d0245f057c7e5f94b26b7c65a.tar.gz gcc-7d4679eaa8b4631d0245f057c7e5f94b26b7c65a.tar.bz2 |
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
Diffstat (limited to 'gcc')
-rw-r--r-- | gcc/ChangeLog | 5 | ||||
-rw-r--r-- | gcc/gansidecl.h | 30 |
2 files changed, 20 insertions, 15 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index e3e61f7e..fdb29ec 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 83625aa..fff81d4 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 |