From 7ce4e411a4415283450121ea9fe2b924eb9d6062 Mon Sep 17 00:00:00 2001 From: BT Templeton Date: Tue, 16 Jul 2013 02:06:16 -0400 Subject: [PATCH] simplify cpp usage in wait_reading_process_output --- src/process.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/process.c b/src/process.c index 394f719fe6..0b6321a1f4 100644 --- a/src/process.c +++ b/src/process.c @@ -4586,16 +4586,18 @@ wait_reading_process_output (intmax_t time_limit, int nsecs, int read_kbd, #endif #if defined (HAVE_NS) - nfds = ns_select +# define SELECT ns_select #elif defined (HAVE_GLIB) - nfds = xg_select +# define SELECT xg_select #else - nfds = pselect +# define SELECT pselect #endif + nfds = SELECT (max (max_process_desc, max_input_desc) + 1, &Available, (check_write ? &Writeok : 0), NULL, &timeout, NULL); +#undef SELECT #ifdef HAVE_GNUTLS /* GnuTLS buffers data internally. In lowat mode it leaves -- 2.20.1