diff options
| author | Dan Nicolaescu <dann@ics.uci.edu> | 2008-10-28 04:25:11 +0000 |
|---|---|---|
| committer | Dan Nicolaescu <dann@ics.uci.edu> | 2008-10-28 04:25:11 +0000 |
| commit | ff808935f5c5473dc699a7fa095fbe82cf605c5d (patch) | |
| tree | 4da128b5899716e974ec91548e7b54b30c458f96 /src/lisp.h | |
| parent | 9fc10007e93fe4f6349976f5a32cae55b5cdb4c8 (diff) | |
| download | emacs-ff808935f5c5473dc699a7fa095fbe82cf605c5d.tar.gz | |
* 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/lisp.h')
| -rw-r--r-- | src/lisp.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/lisp.h b/src/lisp.h index df7f9669175..bffdfba020d 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -3118,8 +3118,12 @@ void synchronize_system_time_locale P_ ((void)); void shut_down_emacs P_ ((int, int, Lisp_Object)); /* Nonzero means don't do interactive redisplay and don't change tty modes */ extern int noninteractive; -/* Nonzero means Emacs was started as a daemon. */ -extern int is_daemon; + +/* Pipe used to send exit notification to the daemon parent at + startup. */ +extern int daemon_pipe[2]; +#define IS_DAEMON (daemon_pipe[1] != 0) + /* Nonzero means don't do use window-system-specific display code */ extern int inhibit_window_system; /* Nonzero means that a filter or a sentinel is running. */ |