From: Dan Nicolaescu <dann@ics.uci.edu>
Date: Mon, 22 Sep 2008 12:42:50 +0000 (+0000)
Subject: (main): Place #ifdef.in the proper place.
X-Git-Tag: emacs-pretest-23.0.90~2812
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9d29095c137170c8918feded7c28622d7472f7d7;p=emacs.git

(main): Place #ifdef.in the proper place.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 97f11fb55bc..4039e582ebe 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2008-09-22  Dan Nicolaescu  <dann@ics.uci.edu>
+
+	* emacs.c (main): Place #ifdef.in the proper place.
+
 2008-09-21  Dan Nicolaescu  <dann@ics.uci.edu>
 
 	* emacs.c (standard_args): Add --daemon.
diff --git a/src/emacs.c b/src/emacs.c
index 131662c27a1..af4a6924240 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -1071,9 +1071,9 @@ main (int argc, char **argv)
       exit (0);
     }
 
-#ifndef DOS_NT
   if (argmatch (argv, argc, "-daemon", "--daemon", 5, NULL, &skip_args))
     {
+#ifndef DOS_NT
       pid_t f = fork();
       int nfd;
       if (f > 0)
@@ -1093,11 +1093,11 @@ main (int argc, char **argv)
 #ifdef HAVE_SETSID
       setsid();
 #endif
-    }
 #else /* DOS_NT */
-  fprintf (stderr, "This platform does not support the -daemon flag.\n");
-  exit (1);
+      fprintf (stderr, "This platform does not support the -daemon flag.\n");
+      exit (1);
 #endif /* DOS_NT */
+    }
 
   if (! noninteractive)
     {