aboutsummaryrefslogtreecommitdiffstats
path: root/src/process.c
diff options
context:
space:
mode:
authorPaul Eggert2018-08-31 09:13:31 -0700
committerPaul Eggert2018-08-31 09:15:49 -0700
commit222b5970c42c2b85df67042c0c5db198859b478a (patch)
treef75630f988959b58f3b863dbc2b25d5173641dfa /src/process.c
parentab871981125393d89202932284eda6e507bfc6fd (diff)
downloademacs-222b5970c42c2b85df67042c0c5db198859b478a.tar.gz
emacs-222b5970c42c2b85df67042c0c5db198859b478a.zip
Rename Emacs-specific INFINITY constants
Although these constants were not erroneous, as they were used only in modules that did not include <math.h>, it's less confusing to names that cannot be confused with the now-standard INFINITY macro. * src/dispextern.h (SCROLL_INFINITY): New constant. * src/dispnew.c, src/scroll.c (INFINITY): Remove. All uses replaced with SCROLL_INFINITY. * src/process.c (wait_reading_process_output): Rename private constant.
Diffstat (limited to 'src/process.c')
-rw-r--r--src/process.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/process.c b/src/process.c
index 29cedd7ad69..ff81485d261 100644
--- a/src/process.c
+++ b/src/process.c
@@ -5009,7 +5009,7 @@ wait_reading_process_output (intmax_t time_limit, int nsecs, int read_kbd,
5009 Lisp_Object proc; 5009 Lisp_Object proc;
5010 struct timespec timeout, end_time, timer_delay; 5010 struct timespec timeout, end_time, timer_delay;
5011 struct timespec got_output_end_time = invalid_timespec (); 5011 struct timespec got_output_end_time = invalid_timespec ();
5012 enum { MINIMUM = -1, TIMEOUT, INFINITY } wait; 5012 enum { MINIMUM = -1, TIMEOUT, FOREVER } wait;
5013 int got_some_output = -1; 5013 int got_some_output = -1;
5014 uintmax_t prev_wait_proc_nbytes_read = wait_proc ? wait_proc->nbytes_read : 0; 5014 uintmax_t prev_wait_proc_nbytes_read = wait_proc ? wait_proc->nbytes_read : 0;
5015#if defined HAVE_GETADDRINFO_A || defined HAVE_GNUTLS 5015#if defined HAVE_GETADDRINFO_A || defined HAVE_GNUTLS
@@ -5048,7 +5048,7 @@ wait_reading_process_output (intmax_t time_limit, int nsecs, int read_kbd,
5048 end_time = timespec_add (now, make_timespec (time_limit, nsecs)); 5048 end_time = timespec_add (now, make_timespec (time_limit, nsecs));
5049 } 5049 }
5050 else 5050 else
5051 wait = INFINITY; 5051 wait = FOREVER;
5052 5052
5053 while (1) 5053 while (1)
5054 { 5054 {
@@ -7515,7 +7515,7 @@ wait_reading_process_output (intmax_t time_limit, int nsecs, int read_kbd,
7515{ 7515{
7516 register int nfds; 7516 register int nfds;
7517 struct timespec end_time, timeout; 7517 struct timespec end_time, timeout;
7518 enum { MINIMUM = -1, TIMEOUT, INFINITY } wait; 7518 enum { MINIMUM = -1, TIMEOUT, FOREVER } wait;
7519 7519
7520 if (TYPE_MAXIMUM (time_t) < time_limit) 7520 if (TYPE_MAXIMUM (time_t) < time_limit)
7521 time_limit = TYPE_MAXIMUM (time_t); 7521 time_limit = TYPE_MAXIMUM (time_t);
@@ -7529,7 +7529,7 @@ wait_reading_process_output (intmax_t time_limit, int nsecs, int read_kbd,
7529 make_timespec (time_limit, nsecs)); 7529 make_timespec (time_limit, nsecs));
7530 } 7530 }
7531 else 7531 else
7532 wait = INFINITY; 7532 wait = FOREVER;
7533 7533
7534 /* Turn off periodic alarms (in case they are in use) 7534 /* Turn off periodic alarms (in case they are in use)
7535 and then turn off any other atimers, 7535 and then turn off any other atimers,
@@ -7635,7 +7635,7 @@ wait_reading_process_output (intmax_t time_limit, int nsecs, int read_kbd,
7635 /* If we woke up due to SIGWINCH, actually change size now. */ 7635 /* If we woke up due to SIGWINCH, actually change size now. */
7636 do_pending_window_change (0); 7636 do_pending_window_change (0);
7637 7637
7638 if (wait < INFINITY && nfds == 0 && ! timeout_reduced_for_timers) 7638 if (wait < FOREVER && nfds == 0 && ! timeout_reduced_for_timers)
7639 /* We waited the full specified time, so return now. */ 7639 /* We waited the full specified time, so return now. */
7640 break; 7640 break;
7641 7641