diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2012-04-21 21:48:13 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2012-04-21 21:48:13 -0700 |
| commit | e4d81efc58695c19154d5f6733d91172b4c3e5b7 (patch) | |
| tree | a3e090515c7a6c7afb302b0bcc03c241da2a9585 | |
| parent | a8b7caa345d8215468f558c771b703a3b89e2d77 (diff) | |
| download | emacs-e4d81efc58695c19154d5f6733d91172b4c3e5b7.tar.gz | |
* process.h (struct Lisp_Process): Members tick and update_tick
are now of type EMACS_INT, not int.
* process.c (process_tick, update_tick): Use EMACS_INT, not int.
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/process.c | 4 | ||||
| -rw-r--r-- | src/process.h | 4 |
3 files changed, 8 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 336c175be5c..bdc70f54f29 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,8 @@ 2012-04-22 Paul Eggert <eggert@cs.ucla.edu> + * process.h (struct Lisp_Process): Members tick and update_tick + are now of type EMACS_INT, not int. + Fix integer width and related bugs (Bug#9874). * alloc.c (pure_bytes_used_lisp, pure_bytes_used_non_lisp): (allocate_vectorlike, buffer_memory_full, struct sdata, SDATA_SIZE) @@ -569,6 +572,7 @@ (Fsignal_process): Simplify by avoiding a goto. Check for process-ids out of pid_t range rather than relying on undefined behavior. + (process_tick, update_tick): Use EMACS_INT, not int. (Fformat_network_address, read_process_output, send_process) (Fprocess_send_region, status_notify): Use ptrdiff_t, not EMACS_INT, where ptrdiff_t is wide enough. diff --git a/src/process.c b/src/process.c index a84dac144d8..4d59ff0d452 100644 --- a/src/process.c +++ b/src/process.c @@ -182,9 +182,9 @@ extern int h_errno; #endif /* Number of events of change of status of a process. */ -static int process_tick; +static EMACS_INT process_tick; /* Number of events for which the user or sentinel has been notified. */ -static int update_tick; +static EMACS_INT update_tick; /* Define NON_BLOCKING_CONNECT if we can support non-blocking connects. */ diff --git a/src/process.h b/src/process.h index 3eb94cb196b..edb937893b0 100644 --- a/src/process.h +++ b/src/process.h @@ -95,9 +95,9 @@ struct Lisp_Process /* Descriptor by which we write to this process */ int outfd; /* Event-count of last event in which this process changed status. */ - int tick; + EMACS_INT tick; /* Event-count of last such event reported. */ - int update_tick; + EMACS_INT update_tick; /* Size of carryover in decoding. */ int decoding_carryover; /* Hysteresis to try to read process output in larger blocks. |