diff options
| author | Yuuki Harano <masm+github@masm11.me> | 2020-12-27 03:13:00 +0900 |
|---|---|---|
| committer | Yuuki Harano <masm+github@masm11.me> | 2020-12-27 03:13:00 +0900 |
| commit | b64089c37b4305a511e5ddbf02746862c7c7575e (patch) | |
| tree | c6978d471e4b0b061b7cc9c46147968379aec94f /src/lisp.h | |
| parent | 565d8f57d349c19d9bbb5d5d5fdacf3c70b85d42 (diff) | |
| parent | 4b2ca6bfc079c66cfcf39f2f36dc139012787535 (diff) | |
| download | emacs-b64089c37b4305a511e5ddbf02746862c7c7575e.tar.gz emacs-b64089c37b4305a511e5ddbf02746862c7c7575e.tar.bz2 emacs-b64089c37b4305a511e5ddbf02746862c7c7575e.zip | |
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs into feature/pgtk
Diffstat (limited to 'src/lisp.h')
| -rw-r--r-- | src/lisp.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lisp.h b/src/lisp.h index e83304462fa..501bcd14a6f 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -4493,14 +4493,14 @@ extern void setup_process_coding_systems (Lisp_Object); /* Defined in callproc.c. */ #ifdef DOS_NT -# define CHILD_SETUP_TYPE int # define CHILD_SETUP_ERROR_DESC "Spawning child process" #else -# define CHILD_SETUP_TYPE _Noreturn void # define CHILD_SETUP_ERROR_DESC "Doing vfork" #endif -extern CHILD_SETUP_TYPE child_setup (int, int, int, char **, bool, Lisp_Object); +extern int emacs_spawn (pid_t *, int, int, int, char **, char **, const char *, + const char *); +extern char **make_environment_block (Lisp_Object); extern void init_callproc_1 (void); extern void init_callproc (void); extern void set_initial_environment (void); |