From: Eli Zaretskii <eliz@gnu.org>
Date: Fri, 19 Apr 2002 10:11:57 +0000 (+0000)
Subject: (bcopy, bzero, bcmp): Define only if HAVE_BCOPY is not defined.
X-Git-Tag: ttn-vms-21-2-B4~15534
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ec07b63d6f2eba4ea4c312ddd1a06c8414f2db42;p=emacs.git

(bcopy, bzero, bcmp): Define only if HAVE_BCOPY is not defined.
---

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.