X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fsyssignal.h;h=8b2747c38825ad8cbc0eec00064e24a17dc4a193;hb=166ba1350d802535b6a6ea7ea0bc29c56a71b7ec;hp=d04b378794e7e41f87ed1526b5d8764f2015aff2;hpb=6883ee56ec887c2c48abe5b06b5e66aa74031910;p=chise%2Fxemacs-chise.git.1

diff --git a/src/syssignal.h b/src/syssignal.h
index d04b378..8b2747c 100644
--- a/src/syssignal.h
+++ b/src/syssignal.h
@@ -20,8 +20,8 @@ Boston, MA 02111-1307, USA.  */
 
 /* 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
@@ -112,30 +112,30 @@ signal_handler_t sys_do_signal (int signal_number, signal_handler_t action);
 
 #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)
 
@@ -159,8 +159,8 @@ signal_handler_t sys_do_signal (int signal_number, signal_handler_t action);
 #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)
 
@@ -209,13 +209,13 @@ signal_handler_t sys_do_signal (int signal_number, signal_handler_t action);
 
 /* 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
 
@@ -227,21 +227,21 @@ signal_handler_t sys_do_signal (int signal_number, signal_handler_t action);
    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_ */