diff options
| author | Paul Eggert | 2012-04-21 21:48:13 -0700 |
|---|---|---|
| committer | Paul Eggert | 2012-04-21 21:48:13 -0700 |
| commit | e4d81efc58695c19154d5f6733d91172b4c3e5b7 (patch) | |
| tree | a3e090515c7a6c7afb302b0bcc03c241da2a9585 | |
| parent | a8b7caa345d8215468f558c771b703a3b89e2d77 (diff) | |
| download | emacs-e4d81efc58695c19154d5f6733d91172b4c3e5b7.tar.gz emacs-e4d81efc58695c19154d5f6733d91172b4c3e5b7.zip | |
* 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 @@ | |||
| 1 | 2012-04-22 Paul Eggert <eggert@cs.ucla.edu> | 1 | 2012-04-22 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 2 | ||
| 3 | * process.h (struct Lisp_Process): Members tick and update_tick | ||
| 4 | are now of type EMACS_INT, not int. | ||
| 5 | |||
| 3 | Fix integer width and related bugs (Bug#9874). | 6 | Fix integer width and related bugs (Bug#9874). |
| 4 | * alloc.c (pure_bytes_used_lisp, pure_bytes_used_non_lisp): | 7 | * alloc.c (pure_bytes_used_lisp, pure_bytes_used_non_lisp): |
| 5 | (allocate_vectorlike, buffer_memory_full, struct sdata, SDATA_SIZE) | 8 | (allocate_vectorlike, buffer_memory_full, struct sdata, SDATA_SIZE) |
| @@ -569,6 +572,7 @@ | |||
| 569 | (Fsignal_process): Simplify by avoiding a goto. | 572 | (Fsignal_process): Simplify by avoiding a goto. |
| 570 | Check for process-ids out of pid_t range rather than relying on | 573 | Check for process-ids out of pid_t range rather than relying on |
| 571 | undefined behavior. | 574 | undefined behavior. |
| 575 | (process_tick, update_tick): Use EMACS_INT, not int. | ||
| 572 | (Fformat_network_address, read_process_output, send_process) | 576 | (Fformat_network_address, read_process_output, send_process) |
| 573 | (Fprocess_send_region, status_notify): | 577 | (Fprocess_send_region, status_notify): |
| 574 | Use ptrdiff_t, not EMACS_INT, where ptrdiff_t is wide enough. | 578 | 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; | |||
| 182 | #endif | 182 | #endif |
| 183 | 183 | ||
| 184 | /* Number of events of change of status of a process. */ | 184 | /* Number of events of change of status of a process. */ |
| 185 | static int process_tick; | 185 | static EMACS_INT process_tick; |
| 186 | /* Number of events for which the user or sentinel has been notified. */ | 186 | /* Number of events for which the user or sentinel has been notified. */ |
| 187 | static int update_tick; | 187 | static EMACS_INT update_tick; |
| 188 | 188 | ||
| 189 | /* Define NON_BLOCKING_CONNECT if we can support non-blocking connects. */ | 189 | /* Define NON_BLOCKING_CONNECT if we can support non-blocking connects. */ |
| 190 | 190 | ||
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 | |||
| 95 | /* Descriptor by which we write to this process */ | 95 | /* Descriptor by which we write to this process */ |
| 96 | int outfd; | 96 | int outfd; |
| 97 | /* Event-count of last event in which this process changed status. */ | 97 | /* Event-count of last event in which this process changed status. */ |
| 98 | int tick; | 98 | EMACS_INT tick; |
| 99 | /* Event-count of last such event reported. */ | 99 | /* Event-count of last such event reported. */ |
| 100 | int update_tick; | 100 | EMACS_INT update_tick; |
| 101 | /* Size of carryover in decoding. */ | 101 | /* Size of carryover in decoding. */ |
| 102 | int decoding_carryover; | 102 | int decoding_carryover; |
| 103 | /* Hysteresis to try to read process output in larger blocks. | 103 | /* Hysteresis to try to read process output in larger blocks. |