From 7109132248e4d20f0cbf7d53339ac9761380783c Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Sun, 3 Mar 2002 20:11:42 +0000 Subject: [PATCH] [!emacs]: Move #define of bcopy to after string.h. --- src/ChangeLog | 7 +++++++ src/tparam.c | 8 +++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 1db79cfc82c..13b73240d71 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,10 @@ +2002-03-03 Gary Wong + + * termcap.c [!emacs]: Replace ospeed for building standalone + libtermcap, for binary compatibility. + + * tparam.c [!emacs]: Move #define of bcopy to after string.h. + 2002-03-03 Richard M. Stallman * xrdb.c (file_p): Rename arg `path' to `filename'. diff --git a/src/tparam.c b/src/tparam.c index 0548c722198..5a9809aab47 100644 --- a/src/tparam.c +++ b/src/tparam.c @@ -24,9 +24,6 @@ Boston, MA 02111-1307, USA. */ #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 *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 */ #ifndef NULL -- 2.39.5