comparison src/process.c @ 109793:b60dcdd855f0

Merge from mainline.
author Katsumi Yamaoka <yamaoka@jpl.org>
date Sun, 08 Aug 2010 22:52:25 +0000
parents bd826f80a765
children 64732fa6188a
comparison
equal deleted inserted replaced
109649:1f8f03cfcd2b 109793:b60dcdd855f0
62 #if defined(HAVE_SYS_IOCTL_H) 62 #if defined(HAVE_SYS_IOCTL_H)
63 #include <sys/ioctl.h> 63 #include <sys/ioctl.h>
64 #if !defined (O_NDELAY) && defined (HAVE_PTYS) && !defined(USG5) 64 #if !defined (O_NDELAY) && defined (HAVE_PTYS) && !defined(USG5)
65 #include <fcntl.h> 65 #include <fcntl.h>
66 #endif /* HAVE_PTYS and no O_NDELAY */ 66 #endif /* HAVE_PTYS and no O_NDELAY */
67 #if defined(HAVE_NET_IF_H)
68 #include <net/if.h>
69 #endif /* HAVE_NET_IF_H */
67 #endif /* HAVE_SYS_IOCTL_H */ 70 #endif /* HAVE_SYS_IOCTL_H */
68 71
69 #ifdef NEED_BSDTTY 72 #ifdef NEED_BSDTTY
70 #include <bsdtty.h> 73 #include <bsdtty.h>
71 #endif
72
73 /* Can we use SIOCGIFCONF and/or SIOCGIFADDR */
74 #if defined(HAVE_SYS_IOCTL_H) && defined(HAVE_NET_IF_H)
75 /* sys/ioctl.h may have been included already */
76 #ifndef SIOCGIFADDR
77 #include <sys/ioctl.h>
78 #endif
79 #include <net/if.h>
80 #endif 74 #endif
81 75
82 #ifdef HAVE_SYS_WAIT 76 #ifdef HAVE_SYS_WAIT
83 #include <sys/wait.h> 77 #include <sys/wait.h>
84 #endif 78 #endif
85 79
86 #ifdef HAVE_RES_INIT 80 #ifdef HAVE_RES_INIT
87 #include <netinet/in.h> 81 #include <netinet/in.h>
88 #include <arpa/nameser.h> 82 #include <arpa/nameser.h>
89 #include <resolv.h> 83 #include <resolv.h>
84 #endif
85
86 #ifdef HAVE_UTIL_H
87 #include <util.h>
90 #endif 88 #endif
91 89
92 #endif /* subprocesses */ 90 #endif /* subprocesses */
93 91
94 #include "lisp.h" 92 #include "lisp.h"
114 #include "syswait.h" 112 #include "syswait.h"
115 113
116 #if defined (USE_GTK) || defined (HAVE_GCONF) 114 #if defined (USE_GTK) || defined (HAVE_GCONF)
117 #include "xgselect.h" 115 #include "xgselect.h"
118 #endif /* defined (USE_GTK) || defined (HAVE_GCONF) */ 116 #endif /* defined (USE_GTK) || defined (HAVE_GCONF) */
119 117 #ifdef HAVE_NS
118 #include "nsterm.h"
119 #endif
120 extern int timers_run; 120 extern int timers_run;
121 121
122 Lisp_Object Qeuid, Qegid, Qcomm, Qstate, Qppid, Qpgrp, Qsess, Qttname, Qtpgid; 122 Lisp_Object Qeuid, Qegid, Qcomm, Qstate, Qppid, Qpgrp, Qsess, Qttname, Qtpgid;
123 Lisp_Object Qminflt, Qmajflt, Qcminflt, Qcmajflt, Qutime, Qstime, Qcstime; 123 Lisp_Object Qminflt, Qmajflt, Qcminflt, Qcmajflt, Qutime, Qstime, Qcstime;
124 Lisp_Object Qcutime, Qpri, Qnice, Qthcount, Qstart, Qvsize, Qrss, Qargs; 124 Lisp_Object Qcutime, Qpri, Qnice, Qthcount, Qstart, Qvsize, Qrss, Qargs;
6353 SIGTYPE 6353 SIGTYPE
6354 sigchld_handler (int signo) 6354 sigchld_handler (int signo)
6355 { 6355 {
6356 int old_errno = errno; 6356 int old_errno = errno;
6357 Lisp_Object proc; 6357 Lisp_Object proc;
6358 register struct Lisp_Process *p; 6358 struct Lisp_Process *p;
6359 extern EMACS_TIME *input_available_clear_time;
6360 6359
6361 SIGNAL_THREAD_CHECK (signo); 6360 SIGNAL_THREAD_CHECK (signo);
6362 6361
6363 while (1) 6362 while (1)
6364 { 6363 {