summaryrefslogtreecommitdiff
path: root/src/emacs.c
diff options
context:
space:
mode:
authorKen Brown <kbrown@cornell.edu>2020-10-29 08:45:29 -0400
committerKen Brown <kbrown@cornell.edu>2020-10-29 08:45:29 -0400
commit2d15296db112740bcb6e7fa5808b57f12a99e49e (patch)
treecdbcec0ff4a54bd397722ca8c893a11547a74baa /src/emacs.c
parent8abce5b0c62d41f1f6a074742af1a4749ae7d4ab (diff)
downloademacs-2d15296db112740bcb6e7fa5808b57f12a99e49e.tar.gz
Fix failure of 'emacs --daemon' on Cygwin
* src/emacs.c (DAEMON_MUST_EXEC): Define unconditionally on Cygwin, not just if HAVE_NTGUI is defined. This fixes the failure of 'emacs --daemon' to start on the non-w32 Cygwin builds. (Bug#44285)
Diffstat (limited to 'src/emacs.c')
-rw-r--r--src/emacs.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/emacs.c b/src/emacs.c
index 11dcdb33fe0..3836f179abc 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -171,7 +171,7 @@ static uintmax_t heap_bss_diff;
We mark being in the exec'd process by a daemon name argument of
form "--daemon=\nFD0,FD1\nNAME" where FD are the pipe file descriptors,
NAME is the original daemon name, if any. */
-#if defined NS_IMPL_COCOA || (defined HAVE_NTGUI && defined CYGWIN)
+#if defined NS_IMPL_COCOA || defined CYGWIN
# define DAEMON_MUST_EXEC
#endif