aboutsummaryrefslogtreecommitdiffstats
path: root/src/process.c
diff options
context:
space:
mode:
authorGregory Heytings2022-11-24 14:21:30 +0100
committerGregory Heytings2022-11-24 14:21:30 +0100
commitba9315b1641b483f2bf843c38dcdba0cd1643a55 (patch)
treed119cae86c7386db66be72972d90f6c83215974d /src/process.c
parentaef803d6c3d61004f15d0bc82fa7bf9952302312 (diff)
parenta3b654e069e563b0a2a6335ec310ada51400ac09 (diff)
downloademacs-ba9315b1641b483f2bf843c38dcdba0cd1643a55.tar.gz
emacs-ba9315b1641b483f2bf843c38dcdba0cd1643a55.zip
Merge master into feature/improved-locked-narrowing.
Diffstat (limited to 'src/process.c')
-rw-r--r--src/process.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/process.c b/src/process.c
index 358899cdede..5144c5d6c92 100644
--- a/src/process.c
+++ b/src/process.c
@@ -292,7 +292,6 @@ static int child_signal_read_fd = -1;
292 descriptor to notify `wait_reading_process_output' of process 292 descriptor to notify `wait_reading_process_output' of process
293 status changes. */ 293 status changes. */
294static int child_signal_write_fd = -1; 294static int child_signal_write_fd = -1;
295static void child_signal_init (void);
296#ifndef WINDOWSNT 295#ifndef WINDOWSNT
297static void child_signal_read (int, void *); 296static void child_signal_read (int, void *);
298#endif 297#endif
@@ -7323,7 +7322,7 @@ process has been transmitted to the serial port. */)
7323 7322
7324/* Set up `child_signal_read_fd' and `child_signal_write_fd'. */ 7323/* Set up `child_signal_read_fd' and `child_signal_write_fd'. */
7325 7324
7326static void 7325void
7327child_signal_init (void) 7326child_signal_init (void)
7328{ 7327{
7329 /* Either both are initialized, or both are uninitialized. */ 7328 /* Either both are initialized, or both are uninitialized. */