/* Synched up with: FSF 19.30. */
-#ifndef _XEMACS_SYSSIGNAL_H_
-#define _XEMACS_SYSSIGNAL_H_
+#ifndef INCLUDED_syssignal_h_
+#define INCLUDED_syssignal_h_
/* In the old world, one could not #include <signal.h> here. The party line
was that that header should always be #included before <config.h>, because
#define EMACS_BLOCK_SIGNAL(sig) do \
{ \
- sigset_t _mask; \
- sigemptyset (&_mask); \
- sigaddset (&_mask, sig); \
- sigprocmask (SIG_BLOCK, &_mask, NULL); \
+ sigset_t ES_mask; \
+ sigemptyset (&ES_mask); \
+ sigaddset (&ES_mask, sig); \
+ sigprocmask (SIG_BLOCK, &ES_mask, NULL); \
} while (0)
#define EMACS_UNBLOCK_SIGNAL(sig) do \
{ \
- sigset_t _mask; \
- sigemptyset (&_mask); \
- sigaddset (&_mask, sig); \
- sigprocmask (SIG_UNBLOCK, &_mask, NULL); \
+ sigset_t ES_mask; \
+ sigemptyset (&ES_mask); \
+ sigaddset (&ES_mask, sig); \
+ sigprocmask (SIG_UNBLOCK, &ES_mask, NULL); \
} while (0)
#define EMACS_UNBLOCK_ALL_SIGNALS() do \
{ \
- sigset_t _mask; \
- sigemptyset (&_mask); \
- sigprocmask (SIG_SETMASK, &_mask, NULL); \
+ sigset_t ES_mask; \
+ sigemptyset (&ES_mask); \
+ sigprocmask (SIG_SETMASK, &ES_mask, NULL); \
} while (0)
#define EMACS_WAIT_FOR_SIGNAL(sig) do \
{ \
- sigset_t _mask; \
- sigprocmask (0, NULL, &_mask); \
- sigdelset (&_mask, sig); \
- sigsuspend (&_mask); \
+ sigset_t ES_mask; \
+ sigprocmask (0, NULL, &ES_mask); \
+ sigdelset (&ES_mask, sig); \
+ sigsuspend (&ES_mask); \
} while (0)
#define EMACS_REESTABLISH_SIGNAL(sig, handler)
#define EMACS_UNBLOCK_ALL_SIGNALS() sigsetmask (0)
#define EMACS_WAIT_FOR_SIGNAL(sig) do \
{ \
- int _mask = sigblock (0); \
- sigpause (_mask & ~sigmask (sig)); \
+ int ES_mask = sigblock (0); \
+ sigpause (ES_mask & ~sigmask (sig)); \
} while (0)
#define EMACS_REESTABLISH_SIGNAL(sig, handler)
/* On bsd, [man says] kill does not accept a negative number to kill a pgrp.
Must do that using the killpg call. */
-#ifdef BSD
-#define EMACS_KILLPG(gid, signo) killpg (gid, signo)
+#ifdef HAVE_KILLPG
+#define EMACS_KILLPG(pid, signo) killpg (pid, signo)
#else
-#ifdef WINDOWSNT
-#define EMACS_KILLPG(gid, signo) (kill (gid, signo))
+#ifdef WIN32_NATIVE
+#define EMACS_KILLPG(pid, signo) kill (pid, signo)
#else
-#define EMACS_KILLPG(gid, signo) kill (-(gid), signo)
+#define EMACS_KILLPG(pid, signo) kill (-(pid), signo)
#endif
#endif
configure incorrectly fails to find it, so s/linux.h defines
HAVE_SYS_SIGLIST. */
#if !defined (SYS_SIGLIST_DECLARED) && !defined (HAVE_SYS_SIGLIST)
-extern CONST char *sys_siglist[];
+extern const char *sys_siglist[];
#endif
#ifdef SIGDANGER
SIGTYPE memory_warning_signal (int sig);
#endif
-#ifdef _WIN32
+#ifdef WIN32_NATIVE
/* Prototypes for signal functions, see nt.c */
-typedef void (__cdecl *msw_sighandler) (int);
-msw_sighandler msw_sigset (int sig, msw_sighandler handler);
-int msw_sighold (int nsig);
-int msw_sigrelse (int nsig);
-int msw_sigpause (int nsig);
-int msw_raise (int nsig);
-#endif /* _WIN32 */
-
-#endif /* _XEMACS_SYSSIGNAL_H_ */
+typedef void (__cdecl *mswindows_sighandler) (int);
+mswindows_sighandler mswindows_sigset (int sig, mswindows_sighandler handler);
+int mswindows_sighold (int nsig);
+int mswindows_sigrelse (int nsig);
+int mswindows_sigpause (int nsig);
+int mswindows_raise (int nsig);
+#endif /* WIN32_NATIVE */
+
+#endif /* INCLUDED_syssignal_h_ */