diff options
| author | Paul Eggert | 2011-05-30 22:45:07 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-05-30 22:45:07 -0700 |
| commit | 86f3178890f56cb408949e125d5d99e3124dd48f (patch) | |
| tree | a2c5f15751bbfe701d2f0da6fab0e0ea1fefc8ce /src/process.c | |
| parent | 12c69b84d1ab93d5b0bd189394952da12340f86d (diff) | |
| parent | b9627cfb1d5b5b0914525a19cd9edb06f91a1665 (diff) | |
| download | emacs-86f3178890f56cb408949e125d5d99e3124dd48f.tar.gz emacs-86f3178890f56cb408949e125d5d99e3124dd48f.zip | |
Merge from trunk.
Diffstat (limited to 'src/process.c')
| -rw-r--r-- | src/process.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/process.c b/src/process.c index 8a94b3e6047..51deb1c933f 100644 --- a/src/process.c +++ b/src/process.c | |||
| @@ -4162,7 +4162,7 @@ wait_reading_process_output_1 (void) | |||
| 4162 | impossible to step through wait_reading_process_output. */ | 4162 | impossible to step through wait_reading_process_output. */ |
| 4163 | 4163 | ||
| 4164 | #ifndef select | 4164 | #ifndef select |
| 4165 | static INLINE int | 4165 | static inline int |
| 4166 | select_wrapper (int n, fd_set *rfd, fd_set *wfd, fd_set *xfd, struct timeval *tmo) | 4166 | select_wrapper (int n, fd_set *rfd, fd_set *wfd, fd_set *xfd, struct timeval *tmo) |
| 4167 | { | 4167 | { |
| 4168 | return select (n, rfd, wfd, xfd, tmo); | 4168 | return select (n, rfd, wfd, xfd, tmo); |