Don't assume process IDs fit in int.

* emacs.c (shut_down_emacs) [!DOS_NT]:
* sysdep.c (sys_suspend) [SIGTSTP && !MSDOS]:
* term.c (dissociate_if_controlling_tty) [!DOS_NT]:
Use pid_t, not int, to store process IDs, as 'int'
is not wide enough on a few platforms (e.g., AIX and IRIX).

diff --git a/src/ChangeLog b/src/ChangeLog
index e59a286110d5f67cf5c9c3e304f44dd960434867..835c550b42665fa890babd067514cd44320f4ebc 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,12 @@
+2012-10-25  Paul Eggert  <eggert@cs.ucla.edu>
+
+       Don't assume process IDs fit in int.
+       * emacs.c (shut_down_emacs) [!DOS_NT]:
+       * sysdep.c (sys_suspend) [SIGTSTP && !MSDOS]:
+       * term.c (dissociate_if_controlling_tty) [!DOS_NT]:
+       Use pid_t, not int, to store process IDs, as 'int'
+       is not wide enough on a few platforms (e.g., AIX and IRIX).
+
 2012-10-23  Kenichi Handa  <handa@gnu.org>
 
        The following change is to make face-font-rescale-alist work

diff --git a/src/emacs.c b/src/emacs.c
index 0a2a60bee0c243e3fc860712ee8dbd214ff43467..7f3228641aed8eb069d359de6d1cded924856d4a 100644 (file)
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -1903,8 +1903,8 @@ shut_down_emacs (int sig, Lisp_Object stuff)
   /* If we are controlling the terminal, reset terminal modes.  */
 #ifndef DOS_NT
   {
-    int pgrp = EMACS_GETPGRP (0);
-    int tpgrp = tcgetpgrp (0);
+    pid_t pgrp = EMACS_GETPGRP (0);
+    pid_t tpgrp = tcgetpgrp (0);
     if ((tpgrp != -1) && tpgrp == pgrp)
       {
        reset_all_sys_modes ();

diff --git a/src/sysdep.c b/src/sysdep.c
index 35beeaa72024996570e78f4d2c00057de6932c48..c7174e91612749d5380160fb2eb2c24395891b67 100644 (file)
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -452,7 +452,7 @@ sys_suspend (void)
 #if defined (SIGTSTP) && !defined (MSDOS)
 
   {
-    int pgrp = EMACS_GETPGRP (0);
+    pid_t pgrp = EMACS_GETPGRP (0);
     EMACS_KILLPG (pgrp, SIGTSTP);
   }
 

diff --git a/src/term.c b/src/term.c
index f7c87b7608de9064727a5e25a257438c880f53fe..74b02b0af278c0caaff8d66535f5d81e5b131d11 100644 (file)
--- a/src/term.c
+++ b/src/term.c
@@ -2919,7 +2919,7 @@ static void
 dissociate_if_controlling_tty (int fd)
 {
 #ifndef DOS_NT
-  int pgid = tcgetpgrp (fd); /* If tcgetpgrp succeeds, fd is the ctty. */
+  pid_t pgid = tcgetpgrp (fd); /* If tcgetpgrp succeeds, fd is the ctty. */
   if (pgid != -1)
     {
 #if defined (USG5)