aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2011-03-19 19:48:50 -0700
committerPaul Eggert2011-03-19 19:48:50 -0700
commit7b8081265e19732eb3e0defde970e1ccfad5fbcc (patch)
treea3fa7a6b72438e17d23f2dfc78ce76b4bd6e0d05 /src
parentf990b4e5d91b66e20f06cc0dab0b3f0ab97c3f91 (diff)
downloademacs-7b8081265e19732eb3e0defde970e1ccfad5fbcc.tar.gz
emacs-7b8081265e19732eb3e0defde970e1ccfad5fbcc.zip
* process.c (FIRST_PROC_DESC, IF_NON_BLOCKING_CONNECT): Remove unused macros.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog1
-rw-r--r--src/process.c9
2 files changed, 1 insertions, 9 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index fa0ff89e5f7..041d4b21754 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -7,6 +7,7 @@
7 (Fmake_network_process): Define label "retry_connect" only if needed. 7 (Fmake_network_process): Define label "retry_connect" only if needed.
8 (Fnetwork_interface_info): Fix pointer signedness. 8 (Fnetwork_interface_info): Fix pointer signedness.
9 (process_send_signal): Add cast to avoid pointer signedness problem. 9 (process_send_signal): Add cast to avoid pointer signedness problem.
10 (FIRST_PROC_DESC, IF_NON_BLOCKING_CONNECT): Remove unused macros.
10 11
112011-03-19 Paul Eggert <eggert@cs.ucla.edu> 122011-03-19 Paul Eggert <eggert@cs.ucla.edu>
12 13
diff --git a/src/process.c b/src/process.c
index ae7ec158ef9..5bc1707756b 100644
--- a/src/process.c
+++ b/src/process.c
@@ -159,9 +159,6 @@ extern Lisp_Object QCfilter;
159#define SERIALCONN_P(p) (EQ (XPROCESS (p)->type, Qserial)) 159#define SERIALCONN_P(p) (EQ (XPROCESS (p)->type, Qserial))
160#define SERIALCONN1_P(p) (EQ ((p)->type, Qserial)) 160#define SERIALCONN1_P(p) (EQ ((p)->type, Qserial))
161 161
162/* Define first descriptor number available for subprocesses. */
163#define FIRST_PROC_DESC 3
164
165#ifndef HAVE_H_ERRNO 162#ifndef HAVE_H_ERRNO
166extern int h_errno; 163extern int h_errno;
167#endif 164#endif
@@ -278,10 +275,6 @@ static SELECT_TYPE connect_wait_mask;
278 275
279/* Number of bits set in connect_wait_mask. */ 276/* Number of bits set in connect_wait_mask. */
280static int num_pending_connects; 277static int num_pending_connects;
281
282#define IF_NON_BLOCKING_CONNECT(s) s
283#else /* NON_BLOCKING_CONNECT */
284#define IF_NON_BLOCKING_CONNECT(s)
285#endif /* NON_BLOCKING_CONNECT */ 278#endif /* NON_BLOCKING_CONNECT */
286 279
287/* The largest descriptor currently in use for a process object. */ 280/* The largest descriptor currently in use for a process object. */
@@ -4930,8 +4923,6 @@ wait_reading_process_output (int time_limit, int microsecs, int read_kbd,
4930 d->func (channel, d->data, 0); 4923 d->func (channel, d->data, 0);
4931 } 4924 }
4932 4925
4933 /* Really FIRST_PROC_DESC should be 0 on Unix,
4934 but this is safer in the short run. */
4935 for (channel = 0; channel <= max_process_desc; channel++) 4926 for (channel = 0; channel <= max_process_desc; channel++)
4936 { 4927 {
4937 if (FD_ISSET (channel, &Available) 4928 if (FD_ISSET (channel, &Available)