[Emacs-diffs] Changes to emacs/src/tparam.c

[Richard M. Stallman]

Index: emacs/src/tparam.c
diff -c emacs/src/tparam.c:1.7 emacs/src/tparam.c:1.8
*** emacs/src/tparam.c:1.7      Fri Dec  8 04:58:48 2000
--- emacs/src/tparam.c  Sun Mar  3 15:11:36 2002
***************
*** 24,32 ****
  #ifdef emacs
  #include "lisp.h"             /* for xmalloc */
  #else
- #if defined(HAVE_STRING_H) || defined(STDC_HEADERS)
- #define bcopy(s, d, n) memcpy ((d), (s), (n))
- #endif
  
  #ifdef STDC_HEADERS
  #include <stdlib.h>
--- 24,29 ----
***************
*** 34,39 ****
--- 31,41 ----
  #else
  char *malloc ();
  char *realloc ();
+ #endif
+ 
+ /* Do this after the include, in case string.h prototypes bcopy.  */
+ #if (defined(HAVE_STRING_H) || defined(STDC_HEADERS)) && !defined(bcopy)
+ #define bcopy(s, d, n) memcpy ((d), (s), (n))
  #endif
  
  #endif /* not emacs */