* m/alpha.h: Do not include <stdlib.h>, as <config.h> does this now.

(NSIG): Remove.
(NSIG_MINIMUM): New macro.
* m/cydra5.h, m/dpx2.h, m/mips.h, m/pfa50.h, m/sps7.h, m/stride.h,
m/ustation.h:
(SIGIO): Do not undef.
(BROKEN_SIGIO): New macro.

* m/ustation.h:
(SIGTSTP): Do not undef.
(BROKEN_SIGTSTP): New macro.
* m/delta.h: Doc fix.

11 files changed, 25 insertions, 43 deletions

diff --git a/src/m/alpha.h b/src/m/alpha.h
index 4440421e41a..f211ef17cab 100644
--- a/src/m/alpha.h
+++ b/src/m/alpha.h
@@ -1,5 +1,5 @@
 /* machine description file For the alpha chip.
-   Copyright (C) 1994, 1997 Free Software Foundation, Inc.
+   Copyright (C) 1994, 1997, 1999 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -241,8 +241,6 @@ NOTE-END
 /* We need these because pointers are larger than the default ints.  */
 #if !defined(__NetBSD__) && !defined(__OpenBSD__)
 #include <alloca.h>
-#else
-#include <stdlib.h>
 #endif
 
 /* Hack alert!  For reasons unknown to mankind the string.h file insists
@@ -299,7 +297,7 @@ extern void r_alloc_free ();
       if (-1 == openpty (&fd, &dummy, pty_name, 0, 0))  \
         fd = -1;                                        \
       sigsetmask (mask);                                \
-      close (dummy);                                    \
+      emacs_close (dummy);                              \
     }                                                   \
   while (0)
 #endif
diff --git a/src/m/amdahl.h b/src/m/amdahl.h
index 08887b49410..9b4bb7481a9 100644
--- a/src/m/amdahl.h
+++ b/src/m/amdahl.h
@@ -1,5 +1,5 @@
 /* amdahl machine description file 
-   Copyright (C) 1987 Free Software Foundation, Inc.
+   Copyright (C) 1987, 1999 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -150,7 +150,4 @@ extern int sign_extend_temp;
 #define STACK_DIRECTION -1
 
 /* Compensate for error in signal.h.  */
-#if NSIG==19
-#undef NSIG
-#define NSIG 20
-#endif
+#define NSIG_MINIMUM 20
diff --git a/src/m/cydra5.h b/src/m/cydra5.h
index fe224f28fd9..5c8fe36388f 100644
--- a/src/m/cydra5.h
+++ b/src/m/cydra5.h
@@ -1,5 +1,5 @@
 /* machine description file for Cydrome's CYDRA 5 mini super computer
-   Copyright (C) 1988 Free Software Foundation, Inc.
+   Copyright (C) 1988, 1999 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -123,4 +123,4 @@ Boston, MA 02111-1307, USA.  */
 
 /* We can't do interrupt-driven input, so don't let user try.  */
 
-#undef SIGIO
+#define BROKEN_SIGIO
diff --git a/src/m/delta.h b/src/m/delta.h
index ee883656c30..8e8498bafd0 100644
--- a/src/m/delta.h
+++ b/src/m/delta.h
@@ -1,7 +1,7 @@
 /* Machine description file for the Motorola Delta.
    Tested on mvme147 board using R3V7 without X.  Tested with gcc.
    Tested on mvme167 board using R3V7 without X.  Tested with cc, gnucc, gcc.
-   Copyright (C) 1986, 1993, 1994 Free Software Foundation, Inc.
+   Copyright (C) 1986, 1993, 1994, 1999 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -137,11 +137,6 @@ Boston, MA 02111-1307, USA.  */
 #undef KERNEL_FILE
 #define KERNEL_FILE "/sysv68"
 #undef LDAV_SYMBOL
-#ifdef SIGIO
- /* R3V7 has SIGIO, but interrupt input does not work yet.
-    Let's go on with cbreak code. */
-/* # define INTERRUPT_INPUT */
-#endif
 
 /* The standard C library is -lc881, not -lc.
    -lbsd brings sigblock and sigsetmask.
diff --git a/src/m/dpx2.h b/src/m/dpx2.h
index 978b2fc88fd..4e72182907d 100644
--- a/src/m/dpx2.h
+++ b/src/m/dpx2.h
@@ -1,5 +1,5 @@
 /* machine description for Bull DPX/2 range 
-   Copyright (C) 1985, 1986 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1999 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -151,9 +151,7 @@ Boston, MA 02111-1307, USA.  */
  * if SIGIO is defined, much of the emacs
  * code assumes we are BSD !!
  */
-#ifdef SIGIO
-# undef SIGIO
-#endif
+#define BROKEN_SIGIO
 
 
 /*
@@ -162,7 +160,6 @@ Boston, MA 02111-1307, USA.  */
 #define CLASH_DETECTION         /* probably a good idea */
 
 
-#ifdef SIGTSTP
 /*
  * sysdep.c(sys_suspend) works fine with emacs-18.58
  * and BOS 02.00.45, if you have an earler version
@@ -170,10 +167,9 @@ Boston, MA 02111-1307, USA.  */
  * to start a sub-shell rather than suspend-emacs,
  * un-comment out the next line.
  */
-/* # undef SIGTSTP /* make suspend-emacs spawn a sub-shell */
-# ifdef NOMULTIPLEJOBS
-#   undef NOMULTIPLEJOBS
-# endif
+/* # define BROKEN_SIGTSTP /* make suspend-emacs spawn a sub-shell */
+#ifdef NOMULTIPLEJOBS
+# undef NOMULTIPLEJOBS
 #endif
 /*
  * no we don't want this at all
diff --git a/src/m/ibmrt-aix.h b/src/m/ibmrt-aix.h
index 6c655ea67fc..d1b80c899ea 100644
--- a/src/m/ibmrt-aix.h
+++ b/src/m/ibmrt-aix.h
@@ -1,5 +1,5 @@
 /* RTPC AIX machine/system dependent defines
-   Copyright (C) 1988 Free Software Foundation, Inc.
+   Copyright (C) 1988, 1999 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -106,7 +106,7 @@ Boston, MA 02111-1307, USA.  */
 { /* Check that server side not already open */         \
   if ((ioctl (*ptyv, PTYSTATUS, 0) & 0xFFFF) != 0)      \
     {                                                   \
-      close (*ptyv);                                    \
+      emacs_close (*ptyv);                              \
       continue;                                         \
     }                                                   \
   /* And finally to be sure we can open it later */     \
diff --git a/src/m/mips.h b/src/m/mips.h
index f2da4a2aa5a..c7ba9150809 100644
--- a/src/m/mips.h
+++ b/src/m/mips.h
@@ -1,5 +1,5 @@
 /* m- file for Mips machines.
-   Copyright (C) 1987, 1992 Free Software Foundation, Inc.
+   Copyright (C) 1987, 1992, 1999 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -198,7 +198,7 @@ NOTE-END  */
 #undef static
 
 /* Don't try to use SIGIO or FIONREAD even though they are defined.  */
-#undef SIGIO
+#define BROKEN_SIGIO
 #define BROKEN_FIONREAD
 
 /* Describe special kernel features.  */
diff --git a/src/m/pfa50.h b/src/m/pfa50.h
index 561ba15bb20..5b8d47aef53 100644
--- a/src/m/pfa50.h
+++ b/src/m/pfa50.h
@@ -1,5 +1,5 @@
 /* Machine description file for PFU A-series.
-   Copyright (C) 1988 Free Software Foundation, Inc.
+   Copyright (C) 1988, 1999 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -91,4 +91,4 @@ Boston, MA 02111-1307, USA.  */
 
 #define NO_SIOCTL_H
 
-#undef SIGIO
+#define BROKEN_SIGIO
diff --git a/src/m/sps7.h b/src/m/sps7.h
index 40f67c8b895..f1e83e24deb 100644
--- a/src/m/sps7.h
+++ b/src/m/sps7.h
@@ -1,5 +1,5 @@
 /* machine description file for Bull SPS-7.
-   Copyright (C) 1986 Free Software Foundation, Inc.
+   Copyright (C) 1986, 1999 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -99,12 +99,8 @@ Boston, MA 02111-1307, USA.  */
 /* Use -T32 for 68020, -T16 otherwise */
 
 #define C_SWITCH_MACHINE -T32
-
-/*
-   Here we assume that signal.h is included before config.h
-   so that we can override it here.  */
   
-#undef SIGIO
+#define BROKEN_SIGIO
 
 /* Other than 68020 use ld16, as32, or undefine (defaults ld and as). */
 
diff --git a/src/m/stride.h b/src/m/stride.h
index 3e031ebe859..770ffe9c230 100644
--- a/src/m/stride.h
+++ b/src/m/stride.h
@@ -1,5 +1,5 @@
 /* Definitions file for GNU Emacs running on Stride Micro System-V.2.2
-   Copyright (C) 1985, 1986 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1999 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -101,7 +101,7 @@ Boston, MA 02111-1307, USA.  */
    signals without losing them.  So, I've gone back to non-SIGIO mode, so
    please append this line to the file "stride.h":
  */
-#undef SIGIO
+#define BROKEN_SIGIO
 
 /* Specify alignment requirement for start of text and data sections
    in the executable file.  */
diff --git a/src/m/ustation.h b/src/m/ustation.h
index b73ff291d12..70a9945dd7e 100644
--- a/src/m/ustation.h
+++ b/src/m/ustation.h
@@ -1,5 +1,5 @@
 /* machine description file for U-station (Nihon Unisys, SS5E; Sumitomo Denkoh, U-Station E30).
-   Copyright (C) 1986 Free Software Foundation, Inc.
+   Copyright (C) 1986, 1999 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -139,5 +139,5 @@ Boston, MA 02111-1307, USA.  */
 #define EXEC_PAGESIZE 1024
 #define PURESIZE 130000
 
-#undef SIGIO
-#undef SIGTSTP
+#define BROKEN_SIGIO
+#define BROKEN_SIGTSTP