aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2012-11-24 23:50:55 -0800
committerPaul Eggert2012-11-24 23:50:55 -0800
commit5fbab051226a3f92fadd45ca716df3af67de8954 (patch)
treea57088cc8a0e15323a2e2165be099acb2ccbc7e9 /src
parente2cb57f5f5794d75cd237e2d6ec2b4d16157c2cd (diff)
downloademacs-5fbab051226a3f92fadd45ca716df3af67de8954.tar.gz
emacs-5fbab051226a3f92fadd45ca716df3af67de8954.zip
* sysdep.c (sys_subshell): Don't assume pid_t fits in int.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/sysdep.c2
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 @@
12012-11-25 Paul Eggert <eggert@cs.ucla.edu>
2
3 * sysdep.c (sys_subshell): Don't assume pid_t fits in int.
4
12012-11-24 Ken Brown <kbrown@cornell.edu> 52012-11-24 Ken Brown <kbrown@cornell.edu>
2 6
3 * keyboard.c (HAVE_MOUSE): 7 * 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)
453 int st; 453 int st;
454 char oldwd[MAXPATHLEN+1]; /* Fixed length is safe on MSDOS. */ 454 char oldwd[MAXPATHLEN+1]; /* Fixed length is safe on MSDOS. */
455#endif 455#endif
456 int pid; 456 pid_t pid;
457 struct save_signal saved_handlers[5]; 457 struct save_signal saved_handlers[5];
458 Lisp_Object dir; 458 Lisp_Object dir;
459 unsigned char *volatile str_volatile = 0; 459 unsigned char *volatile str_volatile = 0;