diff options
| author | Andrea Corallo | 2021-01-30 14:09:37 +0100 |
|---|---|---|
| committer | Andrea Corallo | 2021-01-30 14:09:37 +0100 |
| commit | a8b8d220b4fccaa812e85f9b2b3715593dc285ac (patch) | |
| tree | 07051469f09277b1993eee37870059e3d0abf71e /src/process.c | |
| parent | b8d3ae78c54db7c7bb65d367a80f9be3d8744c48 (diff) | |
| parent | ed2f2cc5577d5d9b61db7a5b61e93e79d678be41 (diff) | |
| download | emacs-a8b8d220b4fccaa812e85f9b2b3715593dc285ac.tar.gz emacs-a8b8d220b4fccaa812e85f9b2b3715593dc285ac.zip | |
Merge remote-tracking branch 'savannah/master' into native-comp
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 1df4ed9ce03..3beb9cf7146 100644 --- a/src/process.c +++ b/src/process.c | |||
| @@ -7217,7 +7217,7 @@ child_signal_read (int fd, void *data) | |||
| 7217 | eassert (0 <= fd); | 7217 | eassert (0 <= fd); |
| 7218 | eassert (fd == child_signal_read_fd); | 7218 | eassert (fd == child_signal_read_fd); |
| 7219 | char dummy; | 7219 | char dummy; |
| 7220 | if (emacs_read (fd, &dummy, 1) < 0) | 7220 | if (emacs_read (fd, &dummy, 1) < 0 && errno != EAGAIN) |
| 7221 | emacs_perror ("reading from child signal FD"); | 7221 | emacs_perror ("reading from child signal FD"); |
| 7222 | } | 7222 | } |
| 7223 | #endif /* !WINDOWSNT */ | 7223 | #endif /* !WINDOWSNT */ |