--- a/src/syssignal.h	Mon Aug 13 11:33:40 2007 +0200
+++ b/src/syssignal.h	Mon Aug 13 11:35:02 2007 +0200
@@ -209,13 +209,13 @@
 
 /* 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 @@
    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 WINDOWSNT
+#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 */
+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_ */