[!emacs]: Move #define of bcopy to after string.h.

diff --git a/src/ChangeLog b/src/ChangeLog
index 1db79cfc82c5f1d696b24d336a058fe40fe4b9fa..13b73240d7154019a4015c381361a720a510c31e 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2002-03-03  Gary Wong  <gtw@gnu.org>
+
+       * 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  <rms@gnu.org>
 
        * xrdb.c (file_p): Rename arg `path' to `filename'.

diff --git a/src/tparam.c b/src/tparam.c
index 0548c722198ce2d260e8025c6cd574b3253b5e1e..5a9809aab47f7f239de5c54c9b3f9e7d979d5059 100644 (file)
--- 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 <stdlib.h>
@@ -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