Merge from trunk.

2 files changed, 5 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 859b3a7d254..c612c4dd365 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-25  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * sysdep.c (sys_subshell): Don't assume pid_t fits in int.
+
 2012-11-24  Ken Brown  <kbrown@cornell.edu>
 
         * keyboard.c (HAVE_MOUSE):
diff --git a/src/sysdep.c b/src/sysdep.c
index bc4dc91509f..1a3834f0379 100644
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -453,7 +453,7 @@ sys_subshell (void)
   int st;
   char oldwd[MAXPATHLEN+1]; /* Fixed length is safe on MSDOS.  */
 #endif
-  int pid;
+  pid_t pid;
   struct save_signal saved_handlers[5];
   Lisp_Object dir;
   unsigned char *volatile str_volatile = 0;