From: Eli Zaretskii <eliz@gnu.org>
Date: Fri, 19 Apr 2002 11:37:56 +0000 (+0000)
Subject: (bcopy, bzero, bcmp): Define only if HAVE_BCOPY is not defined.
X-Git-Tag: emacs-pretest-21.2.91~297
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=10fc43cf0a5d9678b982774c41d643b2b5f7c377;p=emacs.git

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

diff --git a/src/ChangeLog b/src/ChangeLog
index c82bf3f014c..d7283dd5cae 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2002-04-19  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* s/sol2-5.h (bcopy, bzero, bcmp): Define only if HAVE_BCOPY is
+	not defined.
+
 2002-04-17  Jason Rumney  <jasonr@gnu.org>
 
 	* w32fns.c (Fx_file_dialog): Decode file name before using.
diff --git a/src/s/sol2-5.h b/src/s/sol2-5.h
index 913efeefe8e..74d79f92328 100644
--- a/src/s/sol2-5.h
+++ b/src/s/sol2-5.h
@@ -29,6 +29,18 @@
 #define HAVE_VFORK 1
 #endif
 
+/* 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.