aboutsummaryrefslogtreecommitdiffstats
path: root/src/lisp.h
diff options
context:
space:
mode:
authorPaul Eggert2016-04-26 09:12:14 -0700
committerPaul Eggert2016-04-26 09:13:07 -0700
commit40a03df45353692f73364e488c962f1a7cf2e8bc (patch)
tree73db77552ab96859e688c8898b9b770b99635fc5 /src/lisp.h
parent7b9a5c2a451781f674f0a7ebd71f1061a174f627 (diff)
downloademacs-40a03df45353692f73364e488c962f1a7cf2e8bc.tar.gz
emacs-40a03df45353692f73364e488c962f1a7cf2e8bc.zip
Fix socketd fd startup bug that I introduced
Problem reported by Matthew Leach in: http://lists.gnu.org/archive/html/emacs-devel/2016-04/msg00778.html * src/emacs.c (main): Indicate more clearly the coupling between the --daemon option and init_process_emacs. * src/lisp.h: Adjust to API changes. * src/process.c (set_external_socket_descriptor): Remove, replacing by ... (init_process_emacs): ... passing the socket FD here instead. All uses changed.
Diffstat (limited to 'src/lisp.h')
-rw-r--r--src/lisp.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/lisp.h b/src/lisp.h
index c6f8bb89a3f..1fc6130be0b 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -4181,10 +4181,9 @@ extern void delete_keyboard_wait_descriptor (int);
4181extern void add_gpm_wait_descriptor (int); 4181extern void add_gpm_wait_descriptor (int);
4182extern void delete_gpm_wait_descriptor (int); 4182extern void delete_gpm_wait_descriptor (int);
4183#endif 4183#endif
4184extern void init_process_emacs (void); 4184extern void init_process_emacs (int);
4185extern void syms_of_process (void); 4185extern void syms_of_process (void);
4186extern void setup_process_coding_systems (Lisp_Object); 4186extern void setup_process_coding_systems (Lisp_Object);
4187extern void set_external_socket_descriptor (int);
4188 4187
4189/* Defined in callproc.c. */ 4188/* Defined in callproc.c. */
4190#ifndef DOS_NT 4189#ifndef DOS_NT