[Emacs-diffs] /srv/bzr/emacs/trunk r110662: Don't assume process IDs fit in int.

[Paul Eggert]

------------------------------------------------------------
revno: 110662
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Wed 2012-10-24 21:35:39 -0700
message:
  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).
modified:
  src/ChangeLog
  src/emacs.c
  src/sysdep.c
  src/term.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-10-23 15:47:51 +0000
+++ b/src/ChangeLog     2012-10-25 04:35:39 +0000
@@ -1,3 +1,12 @@
+2012-10-25  Paul Eggert  <address@hidden>
+
+       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  <address@hidden>
 
        The following change is to make face-font-rescale-alist work

=== modified file 'src/emacs.c'
--- a/src/emacs.c       2012-10-08 22:14:39 +0000
+++ b/src/emacs.c       2012-10-25 04:35:39 +0000
@@ -1903,8 +1903,8 @@
   /* 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 ();

=== modified file 'src/sysdep.c'
--- a/src/sysdep.c      2012-10-19 19:25:18 +0000
+++ b/src/sysdep.c      2012-10-25 04:35:39 +0000
@@ -452,7 +452,7 @@
 #if defined (SIGTSTP) && !defined (MSDOS)
 
   {
-    int pgrp = EMACS_GETPGRP (0);
+    pid_t pgrp = EMACS_GETPGRP (0);
     EMACS_KILLPG (pgrp, SIGTSTP);
   }
 

=== modified file 'src/term.c'
--- a/src/term.c        2012-10-19 19:25:18 +0000
+++ b/src/term.c        2012-10-25 04:35:39 +0000
@@ -2919,7 +2919,7 @@
 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)