From: Gerd Moellmann <gerd@gnu.org>
Date: Fri, 15 Dec 2000 14:48:46 +0000 (+0000)
Subject: #undef bcopy & al here.  Include strings.h.
X-Git-Tag: emacs-pretest-21.0.95~482
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e61a9a9b83bdc5544d7de17895845281d6630ef8;p=emacs.git

#undef bcopy & al here.  Include strings.h.
---

diff --git a/src/s/irix6-5.h b/src/s/irix6-5.h
index 237ee3beaf2..39e129a4e3a 100644
--- a/src/s/irix6-5.h
+++ b/src/s/irix6-5.h
@@ -32,3 +32,16 @@
 /* Cancel the #define that is in irix5-0.h.  */
 #undef ospeed
 
+/* If we keep the #defines from usg5-4.h, we lose when using the X
+   headers because (at least) the bzero definition breaks their use of
+   strings.h.  Including strings.h here gets us prototypes for them.
+   (They're in libc though also they seem to be intrinsics in the SGI
+   (Cray) compiler at least at version 7.3).  -- fx  */
+#undef bcopy
+#undef bcmp
+#undef bzero
+#ifndef NOT_C_CODE
+#include <strings.h>
+#endif
+
+#undef TIOCSIGSEND		/* defined in usg5-4.h */