# HG changeset patch
# User Dave Love <fx@gnu.org>
# Date 1028154711 0
# Node ID 1bba557c4d525199d093797227333a66a3f19a3c
# Parent  2ec9bfb8adbce207f32d1d9ff6c1aa4c47d139a1
(NO_SIOCTL_H): Don't define.
(TIOCSIGSEND): Don't test IRIX6.
(bcopy, bzero, bcmp): Define conditionally.

diff -r 2ec9bfb8adbc -r 1bba557c4d52 src/s/usg5-4.h
--- a/src/s/usg5-4.h	Wed Jul 31 22:30:08 2002 +0000
+++ b/src/s/usg5-4.h	Wed Jul 31 22:31:51 2002 +0000
@@ -57,13 +57,6 @@
 /* there are no -lg libraries on this system, and no libPW */
 
 #define LIBS_DEBUG
-/* This is turned off because nobody actually uses LIBS_STANDARD (Nov 1995).
-   That name is a typo.  The next step is to delete this entirely.  */
-/* #define LIBS_STANDARD -lc */
-
-/* No <sioctl.h> */
-
-#define NO_SIOCTL_H
 
 /* Undump with ELF */
 
@@ -135,9 +128,7 @@
    subprocesses the usual way.  But TIOCSIGNAL does work for PTYs, and
    this is all we need.  */
 
-#ifndef IRIX6
 #define TIOCSIGSEND TIOCSIGNAL
-#endif
 
 /* This change means that we don't loop through allocate_pty too many
    times in the (rare) event of a failure. */
@@ -198,9 +189,13 @@
    So give it a try.  */
 #define HAVE_SOCKETS
 
+#ifndef HAVE_BCOPY
 #define bcopy(src,dst,n)	memmove (dst,src,n)
+#define bzero(s,n)		memset (s,0,n)
+#endif
+#ifdef HAVE_BCMP
 #define bcmp(src,dst,n)		memcmp (src,dst,n)
-#define bzero(s,n)		memset (s,0,n)
+#endif
 
 /* Markus Weiand <weiand@khof.com> says this is needed for Motif on
    SINIX.  */