[Emacs-diffs] /srv/bzr/emacs/trunk r110450: Fix conditional macros in emacs.c, introduced by cygw32 addition.

[Eli Zaretskii]

------------------------------------------------------------
revno: 110450
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Mon 2012-10-08 12:01:59 +0200
message:
  Fix conditional macros in emacs.c, introduced by cygw32 addition.
  
   src/emacs.c (DAEMON_MUST_EXEC) [HAVE_NTGUI]: Define this only on Cygwin.
modified:
  src/ChangeLog
  src/emacs.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-10-08 07:58:40 +0000
+++ b/src/ChangeLog     2012-10-08 10:01:59 +0000
@@ -1,3 +1,8 @@
+2012-10-08  Eli Zaretskii  <address@hidden>
+
+       * emacs.c (DAEMON_MUST_EXEC) [HAVE_NTGUI]: Define this only on
+       Cygwin.
+
 2012-10-08  Daniel Colascione  <address@hidden>
 
        * xfaces.c, xdisp.c, window.c, w32xfns.c, w32term.h, w32term.c,

=== modified file 'src/emacs.c'
--- a/src/emacs.c       2012-10-07 22:31:58 +0000
+++ b/src/emacs.c       2012-10-08 10:01:59 +0000
@@ -179,7 +179,7 @@
    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