# HG changeset patch
# User Eli Zaretskii <eliz@gnu.org>
# Date 1019211117 0
# Node ID b0d688e29ab4d7fa5234fda400f151310db9ec30
# Parent  3920807b6a9ca327db12778160190f553f5097a9
(bcopy, bzero, bcmp): Define only if HAVE_BCOPY is not defined.

diff -r 3920807b6a9c -r b0d688e29ab4 src/s/sol2-5.h
--- a/src/s/sol2-5.h	Fri Apr 19 07:43:43 2002 +0000
+++ b/src/s/sol2-5.h	Fri Apr 19 10:11:57 2002 +0000
@@ -24,6 +24,18 @@
 
 #undef USE_MMAP_FOR_BUFFERS
 
+/* Newer versions of Solaris have bcopy etc. as functions, with
+   prototypes in strings.h.  They lose if the defines from usg5-4.h
+   are visible, which happens when X headers are included.  */
+#ifdef HAVE_BCOPY
+#undef bcopy
+#undef bzero
+#undef bcmp
+#ifndef NOT_C_CODE
+#include <strings.h>
+#endif
+#endif
+
 #if 0 /* A recent patch in unexelf.c should eliminate the need for this.  */
 /* Don't use the shared libraries for -lXt and -lXaw,
    to work around a linker bug in Solaris 2.5.