frame-override-unsplittable/inhibit-frame-unsplittable name change.

[gnu-emacs] / src / syssignal.h

diff --git a/src/syssignal.h b/src/syssignal.h
index b84c402bb2ccbd8bc4590224671ef59edb19cadb..b7e646a2787e2e945410ba77d61e39860d5f42d5 100644 (file)
--- a/src/syssignal.h
+++ b/src/syssignal.h
@@ -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.  */
 
 #ifdef POSIX_SIGNALS
 
@@ -51,7 +52,9 @@ extern sigset_t sys_sigmask ();
 #define sigpause(SIG)    sys_sigpause (SIG)
 #define sigblock(SIG)    sys_sigblock (SIG)
 #define sigunblock(SIG)  sys_sigunblock (SIG)
+#ifndef sigsetmask
 #define sigsetmask(SIG)  sys_sigsetmask (SIG)
+#endif
 #define sighold(SIG)     ONLY_USED_IN_BSD_4_1
 #define sigrelse(SIG)    ONLY_USED_IN_BSD_4_1
 #undef signal
@@ -113,31 +116,22 @@ sigset_t sys_sigsetmask (/*sigset_t new_mask*/);
 { SIGMASKTYPE omask = sigblock (SIGFULLMASK); sigsetmask (omask & ~SIG); }
 #endif
 
-/* It would be very nice if we could somehow clean up all this trash.  */
-
 #ifndef BSD4_1
 #define sigfree() sigsetmask (SIGEMPTYMASK)
-#define sigholdx(sig) sigsetmask (sigmask (sig))
-#define sigblockx(sig) sigblock (sigmask (sig))
-#define sigunblockx(sig) sigblock (SIGEMPTYMASK)
-#define sigpausex(sig) sigpause (0)
-#endif /* BSD4_1 */
+#endif /* not BSD4_1 */
 
 #ifdef BSD4_1
 #define SIGIO SIGTINT
-/* sigfree and sigholdx are in sysdep.c */
-#define sigblockx(sig) sighold (sig)
-#define sigunblockx(sig) sigrelse (sig)
-#define sigpausex(sig) sigpause (sig)
-#endif /* ! defined (BSD4_1) */
+/* sigfree is in sysdep.c */
+#endif /* BSD4_1 */
 
 /* On bsd, [man says] kill does not accept a negative number to kill a pgrp.
    Must do that using the killpg call.  */
-#ifdef BSD
+#ifdef BSD_SYSTEM
 #define EMACS_KILLPG(gid, signo) (killpg ( (gid), (signo)))
 #else
 #ifdef WINDOWSNT
-#define EMACS_KILLPG(gid, signo) (win32_kill_process (gid, signo))
+#define EMACS_KILLPG(gid, signo) (kill (gid, signo))
 #else
 #define EMACS_KILLPG(gid, signo) (kill   (-(gid), (signo)))
 #endif