diff options
| author | Andrea Corallo <akrl@sdf.org> | 2020-12-27 17:54:57 +0100 |
|---|---|---|
| committer | Andrea Corallo <akrl@sdf.org> | 2020-12-27 17:54:57 +0100 |
| commit | 8fb94630136700aa4e74c7fc212b019d2db380ae (patch) | |
| tree | 69b3938a89f450509a7001f45ba3acca057fb40d /src/lisp.h | |
| parent | 271fb8a269aff924070b188f23355d0c368356dd (diff) | |
| parent | df882c9701755e2ae063f05d3381de14ae09951e (diff) | |
| download | emacs-8fb94630136700aa4e74c7fc212b019d2db380ae.tar.gz emacs-8fb94630136700aa4e74c7fc212b019d2db380ae.tar.bz2 emacs-8fb94630136700aa4e74c7fc212b019d2db380ae.zip | |
Merge remote-tracking branch 'savannah/master' into HEAD
Diffstat (limited to 'src/lisp.h')
| -rw-r--r-- | src/lisp.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/lisp.h b/src/lisp.h index 103ed079559..efbb7a45242 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -4515,16 +4515,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 *const *, - char *const *, const char *); -extern char *const *make_environment_block (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); |