Even more compile stuff.

[bpt/emacs.git] / src / sysdep.c

diff --git a/src/sysdep.c b/src/sysdep.c
index 3de75eb..a9f6b31 100644 (file)
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -125,6 +125,7 @@ extern int errno;
 
 #ifdef BROKEN_TIOCGWINSZ
 #undef TIOCGWINSZ
+#undef TIOCSWINSZ
 #endif
 
 #ifdef USG
@@ -133,7 +134,7 @@ extern int errno;
 #ifndef MEMORY_IN_STRING_H
 #include <memory.h>
 #endif
-#ifdef TIOCGWINSZ
+#if defined (TIOCGWINSZ) || defined (ISC4_0)
 #ifdef NEED_SIOCTL
 #include <sys/sioctl.h>
 #endif
@@ -141,7 +142,7 @@ extern int errno;
 #include <sys/stream.h>
 #include <sys/ptem.h>
 #endif
-#endif /* TIOCGWINSZ */
+#endif /* TIOCGWINSZ or ISC4_0 */
 #endif /* USG */
 
 extern int quit_char;
@@ -697,11 +698,11 @@ sys_subshell ()
       close_process_descs ();  /* Close Emacs's pipes/ptys */
 #endif
 
-#ifdef PRIO_PROCESS
+#ifdef SET_EMACS_PRIORITY
       {
        extern int emacs_priority;
 
-       if (emacs_priority)
+       if (emacs_priority < 0)
          nice (-emacs_priority);
       }
 #endif
@@ -2935,8 +2936,12 @@ char *sys_siglist[NSIG + 1] =
   "exceeded file size limit",              /* 31 SIGXFSZ */
   "process's lwps are blocked",            /*  32 SIGWAITING */
   "special signal used by thread library", /* 33 SIGLWP */
+#ifdef SIGFREEZE
   "Special Signal Used By CPR",            /* 34 SIGFREEZE */
+#endif
+#ifdef SIGTHAW
   "Special Signal Used By CPR",            /* 35 SIGTHAW */
+#endif
 #endif /* sun */
 #endif /* not AIX */
   0