diff options
| author | Dan Nicolaescu | 2008-09-22 12:42:50 +0000 |
|---|---|---|
| committer | Dan Nicolaescu | 2008-09-22 12:42:50 +0000 |
| commit | 9d29095c137170c8918feded7c28622d7472f7d7 (patch) | |
| tree | 20eac2550d1ad7e9e4d21209c4358e1b2c9c3153 /src | |
| parent | b45c803b1039695cf21c682d1339248c26af4c4e (diff) | |
| download | emacs-9d29095c137170c8918feded7c28622d7472f7d7.tar.gz emacs-9d29095c137170c8918feded7c28622d7472f7d7.zip | |
(main): Place #ifdef.in the proper place.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/emacs.c | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 97f11fb55bc..4039e582ebe 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2008-09-22 Dan Nicolaescu <dann@ics.uci.edu> | ||
| 2 | |||
| 3 | * emacs.c (main): Place #ifdef.in the proper place. | ||
| 4 | |||
| 1 | 2008-09-21 Dan Nicolaescu <dann@ics.uci.edu> | 5 | 2008-09-21 Dan Nicolaescu <dann@ics.uci.edu> |
| 2 | 6 | ||
| 3 | * emacs.c (standard_args): Add --daemon. | 7 | * 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) | |||
| 1071 | exit (0); | 1071 | exit (0); |
| 1072 | } | 1072 | } |
| 1073 | 1073 | ||
| 1074 | #ifndef DOS_NT | ||
| 1075 | if (argmatch (argv, argc, "-daemon", "--daemon", 5, NULL, &skip_args)) | 1074 | if (argmatch (argv, argc, "-daemon", "--daemon", 5, NULL, &skip_args)) |
| 1076 | { | 1075 | { |
| 1076 | #ifndef DOS_NT | ||
| 1077 | pid_t f = fork(); | 1077 | pid_t f = fork(); |
| 1078 | int nfd; | 1078 | int nfd; |
| 1079 | if (f > 0) | 1079 | if (f > 0) |
| @@ -1093,11 +1093,11 @@ main (int argc, char **argv) | |||
| 1093 | #ifdef HAVE_SETSID | 1093 | #ifdef HAVE_SETSID |
| 1094 | setsid(); | 1094 | setsid(); |
| 1095 | #endif | 1095 | #endif |
| 1096 | } | ||
| 1097 | #else /* DOS_NT */ | 1096 | #else /* DOS_NT */ |
| 1098 | fprintf (stderr, "This platform does not support the -daemon flag.\n"); | 1097 | fprintf (stderr, "This platform does not support the -daemon flag.\n"); |
| 1099 | exit (1); | 1098 | exit (1); |
| 1100 | #endif /* DOS_NT */ | 1099 | #endif /* DOS_NT */ |
| 1100 | } | ||
| 1101 | 1101 | ||
| 1102 | if (! noninteractive) | 1102 | if (! noninteractive) |
| 1103 | { | 1103 | { |