1 files changed, 12 insertions, 0 deletions

diff --git a/src/s/sol2-5.h b/src/s/sol2-5.h
index 9931e97d375..6a7a550c956 100644
--- a/src/s/sol2-5.h
+++ b/src/s/sol2-5.h
@@ -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.