# HG changeset patch # User Richard M. Stallman # Date 1015186296 0 # Node ID b9ee14ccc0c8a77e38483a7727adbb02b998eb3d # Parent 53deca397c95d512f55cdfb4aba816bb0e6d69c5 [!emacs]: Move #define of bcopy to after string.h. diff -r 53deca397c95 -r b9ee14ccc0c8 src/tparam.c --- a/src/tparam.c Sun Mar 03 20:11:20 2002 +0000 +++ b/src/tparam.c Sun Mar 03 20:11:36 2002 +0000 @@ -24,9 +24,6 @@ #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 @@ -36,6 +33,11 @@ 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 */ #ifndef NULL