(Fmove_to_column): Remove unused local variable `end_byte'.

[gnu-emacs] / src / s / usg5-4.h

diff --git a/src/s/usg5-4.h b/src/s/usg5-4.h
index d6b87ec19ae7e8e41521177bf75d8006bf3b0be6..70fb8ccb74d104f5517ad7caa09b023042fe25d1 100644 (file)
--- a/src/s/usg5-4.h
+++ b/src/s/usg5-4.h
@@ -1,5 +1,5 @@
 /* Definitions file for GNU Emacs running on AT&T's System V Release 4
-   Copyright (C) 1987, 1990 Free Software Foundation, Inc.
+   Copyright (C) 1987, 1990, 1999, 2000 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -15,7 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 /* This file written by James Van Artsdalen of Dell Computer Corporation.
  * james@bigtex.cactus.org.  Subsequently improved for Dell 2.2 by Eric
@@ -32,7 +33,8 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #undef NOMULTIPLEJOBS
 
-#define LIBS_SYSTEM -lsocket -lnsl -lelf
+/* Motif needs -lgen.  */
+#define LIBS_SYSTEM -lsocket -lnsl -lelf -lgen
 #define ORDINARY_LINK
 
 #if 0
@@ -55,7 +57,9 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 /* there are no -lg libraries on this system, and no libPW */
 
 #define LIBS_DEBUG
-#define LIBS_STANDARD -lc
+/* 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> */
 
@@ -78,26 +82,28 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
  * interfere.  And don't try to use SIGIO yet.
  */
 
+#ifndef NOT_C_CODE
+#include <sys/wait.h>
+#endif
+
 #ifdef emacs
+#ifndef NO_FILIO_H
 #include <sys/filio.h>
+#endif
 #include <termio.h>
 #include <sys/ttold.h>
 #include <signal.h>
-#include <sys/wait.h>
 #include <sys/stream.h>
 #include <sys/stropts.h>
 #include <sys/termios.h>
-#undef SIGIO
+#define BROKEN_SIGIO
 #endif
 
 /* Some SVr4s don't define NSIG in sys/signal.h for ANSI environments;
  * instead, there's a system variable _sys_nsig.  Unfortunately, we need the
  * constant to dimension an array.  So wire in the appropriate value here.
  */
-
-#ifndef NSIG
-#define NSIG   32
-#endif
+#define NSIG_MINIMUM 32
 
 /* We need bss_end from emacs.c for undumping */
 
@@ -129,7 +135,9 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
    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. */
@@ -152,12 +160,12 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
                                                        \
     sighold (SIGCLD);                                  \
     if (grantpt (fd) == -1)                            \
-      { close (fd); return -1; }                       \
+      { emacs_close (fd); return -1; }                 \
     sigrelse (SIGCLD);                                 \
     if (unlockpt (fd) == -1)                           \
-      { close (fd); return -1; }                       \
+      { emacs_close (fd); return -1; }                 \
     if (!(ptyname = ptsname (fd)))                     \
-      { close (fd); return -1; }                       \
+      { emacs_close (fd); return -1; }                 \
     strncpy (pty_name, ptyname, sizeof (pty_name));    \
     pty_name[sizeof (pty_name) - 1] = 0;               \
   }
@@ -193,3 +201,8 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #define bcopy(src,dst,n)       memmove (dst,src,n)
 #define bcmp(src,dst,n)                memcmp (src,dst,n)
 #define bzero(s,n)             memset (s,0,n)
+
+/* Markus Weiand <weiand@khof.com> says this is needed for Motif on
+   SINIX.  */
+#undef LIBS_SYSTEM
+#define LIBS_SYSTEM -lgen