aboutsummaryrefslogtreecommitdiffstats
path: root/src/process.h
diff options
context:
space:
mode:
authorPaul Eggert2011-04-15 00:48:51 -0700
committerPaul Eggert2011-04-15 00:48:51 -0700
commit4170f62f39edf1ff1e99aec9bfbfe7bbf10e7fc9 (patch)
treee993b231bb5555c9c961f5d0b20d90ac76f77bbd /src/process.h
parent1963a2e0bb07cc8dee6d27f972f93d9cfd7c6b2d (diff)
parent49093f601b69d91126aefd328ee8f6bfeb797407 (diff)
downloademacs-4170f62f39edf1ff1e99aec9bfbfe7bbf10e7fc9.tar.gz
emacs-4170f62f39edf1ff1e99aec9bfbfe7bbf10e7fc9.zip
Merge from mainline.
Diffstat (limited to 'src/process.h')
-rw-r--r--src/process.h9
1 files changed, 1 insertions, 8 deletions
diff --git a/src/process.h b/src/process.h
index 6bf1084afcd..0348f211bb9 100644
--- a/src/process.h
+++ b/src/process.h
@@ -143,12 +143,6 @@ struct Lisp_Process
143 143
144#define ChannelMask(n) (1<<(n)) 144#define ChannelMask(n) (1<<(n))
145 145
146/* Indexed by descriptor, gives the process (if any) for that descriptor. */
147extern Lisp_Object chan_process[];
148
149/* Alist of elements (NAME . PROCESS). */
150extern Lisp_Object Vprocess_alist;
151
152/* True if we are about to fork off a synchronous process or if we 146/* True if we are about to fork off a synchronous process or if we
153 are waiting for it. */ 147 are waiting for it. */
154extern int synch_process_alive; 148extern int synch_process_alive;
@@ -181,7 +175,7 @@ extern Lisp_Object Qminflt, Qmajflt, Qcminflt, Qcmajflt, Qutime, Qstime;
181extern Lisp_Object Qcutime, Qpri, Qnice, Qthcount, Qstart, Qvsize, Qrss, Qargs; 175extern Lisp_Object Qcutime, Qpri, Qnice, Qthcount, Qstart, Qvsize, Qrss, Qargs;
182extern Lisp_Object Quser, Qgroup, Qetime, Qpcpu, Qpmem, Qtpgid, Qcstime; 176extern Lisp_Object Quser, Qgroup, Qetime, Qpcpu, Qpmem, Qtpgid, Qcstime;
183extern Lisp_Object Qtime, Qctime; 177extern Lisp_Object Qtime, Qctime;
184extern Lisp_Object QCport, QCspeed, QCprocess; 178extern Lisp_Object QCspeed;
185extern Lisp_Object QCbytesize, QCstopbits, QCparity, Qodd, Qeven; 179extern Lisp_Object QCbytesize, QCstopbits, QCparity, Qodd, Qeven;
186extern Lisp_Object QCflowcontrol, Qhw, Qsw, QCsummary; 180extern Lisp_Object QCflowcontrol, Qhw, Qsw, QCsummary;
187 181
@@ -198,4 +192,3 @@ extern void add_read_fd (int fd, fd_callback func, void *data);
198extern void delete_read_fd (int fd); 192extern void delete_read_fd (int fd);
199extern void add_write_fd (int fd, fd_callback func, void *data); 193extern void add_write_fd (int fd, fd_callback func, void *data);
200extern void delete_write_fd (int fd); 194extern void delete_write_fd (int fd);
201