Mercurial > emacs
changeset 43675:b9ee14ccc0c8
[!emacs]: Move #define of bcopy to after string.h.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Sun, 03 Mar 2002 20:11:36 +0000 |
| parents | 53deca397c95 |
| children | 48171c57082c |
| files | src/tparam.c |
| diffstat | 1 files changed, 5 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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 <stdlib.h> @@ -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