--- a/src/syssignal.h	Mon Aug 13 11:12:06 2007 +0200
+++ b/src/syssignal.h	Mon Aug 13 11:13:30 2007 +0200
@@ -20,8 +20,8 @@
 
 /* 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
@@ -213,7 +213,7 @@
 #define EMACS_KILLPG(gid, signo) killpg (gid, signo)
 #else
 #ifdef WINDOWSNT
-#define EMACS_KILLPG(gid, signo) (kill (gid, signo))
+#define EMACS_KILLPG(gid, signo) kill (gid, signo)
 #else
 #define EMACS_KILLPG(gid, signo) kill (-(gid), signo)
 #endif
@@ -227,14 +227,14 @@
    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 WINDOWSNT
 /* Prototypes for signal functions, see nt.c */
 typedef void (__cdecl *msw_sighandler) (int);
 msw_sighandler msw_sigset (int sig, msw_sighandler handler);
@@ -244,4 +244,4 @@
 int msw_raise (int nsig);
 #endif /* _WIN32 */
 
-#endif /* _XEMACS_SYSSIGNAL_H_ */
+#endif /* INCLUDED_syssignal_h_ */