diff --git a/src/ChangeLog b/src/ChangeLog index 2a3121995128b8c6897a436dcbf10bbb7e20d402..c7c3330df300e76cdac6c66b6893dec1000b9f76 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2012-10-08 Eli Zaretskii + + * emacs.c (DAEMON_MUST_EXEC) [HAVE_NTGUI]: Define this only on + Cygwin. + 2012-10-08 Daniel Colascione * xfaces.c, xdisp.c, window.c, w32xfns.c, w32term.h, w32term.c, diff --git a/src/emacs.c b/src/emacs.c index 6cc50a23d662fb7d8fa2adb39bb1e5d16de2950c..0a9cc484f7af01c9d94d9613dff3d32e46cae65b 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -179,7 +179,7 @@ static uprintmax_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) +#if defined (NS_IMPL_COCOA) || (defined (HAVE_NTGUI) && defined (CYGWIN)) # define DAEMON_MUST_EXEC #endif