From: Ken Brown <kbrown@cornell.edu>
Date: Thu, 29 Oct 2020 12:45:29 +0000 (-0400)
Subject: Fix failure of 'emacs --daemon' on Cygwin
X-Git-Tag: emacs-27.1.90~93
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2d15296db112740bcb6e7fa5808b57f12a99e49e;p=emacs.git

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)
---

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