diff options
| author | Dan Nicolaescu | 2008-10-28 04:25:11 +0000 |
|---|---|---|
| committer | Dan Nicolaescu | 2008-10-28 04:25:11 +0000 |
| commit | ff808935f5c5473dc699a7fa095fbe82cf605c5d (patch) | |
| tree | 4da128b5899716e974ec91548e7b54b30c458f96 /src/emacs.c | |
| parent | 9fc10007e93fe4f6349976f5a32cae55b5cdb4c8 (diff) | |
| download | emacs-ff808935f5c5473dc699a7fa095fbe82cf605c5d.tar.gz emacs-ff808935f5c5473dc699a7fa095fbe82cf605c5d.zip | |
* emacs.c (daemon_pipe): Make non-static.
(IS_DAEMON): Move definition ...
* lisp.h (IS_DAEMON): ... here.
(daemon_pipe): Declare.
(is_daemon): Remove.
* dispnew.c (init_display): Use IS_DAEMON.
Diffstat (limited to 'src/emacs.c')
| -rw-r--r-- | src/emacs.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/emacs.c b/src/emacs.c index b3dee7776a2..d707f4f758d 100644 --- a/src/emacs.c +++ b/src/emacs.c | |||
| @@ -240,9 +240,7 @@ static char *daemon_name; | |||
| 240 | 240 | ||
| 241 | /* Pipe used to send exit notification to the daemon parent at | 241 | /* Pipe used to send exit notification to the daemon parent at |
| 242 | startup. */ | 242 | startup. */ |
| 243 | static int daemon_pipe[2]; | 243 | int daemon_pipe[2]; |
| 244 | |||
| 245 | #define IS_DAEMON (daemon_pipe[1] != 0) | ||
| 246 | 244 | ||
| 247 | /* Save argv and argc. */ | 245 | /* Save argv and argc. */ |
| 248 | char **initial_argv; | 246 | char **initial_argv; |