diff options
| author | Eli Zaretskii | 2020-12-24 17:58:51 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2020-12-24 17:58:51 +0200 |
| commit | 527cc64e5d7e8945dfb89bf44d5f4141bd221456 (patch) | |
| tree | 03c4df7a7d97fb4d56fe243118d4effde8245884 /src/process.c | |
| parent | 29064d02c31b08ae41d41a93fd1439718373b196 (diff) | |
| download | emacs-527cc64e5d7e8945dfb89bf44d5f4141bd221456.tar.gz emacs-527cc64e5d7e8945dfb89bf44d5f4141bd221456.zip | |
Unbreak the MinGW build broken by recent changes in callproc.c
* src/w32.h (set_process_dir):
* src/w32proc.c (set_process_dir): Change the argument to 'const
char *'.
* src/lisp.h (make_environment_block):
* src/callproc.c (make_environment_block): Now returns 'char **'.
(exec_failed) [DOS_NT]: Remove unused function.
* src/callproc.c (child_setup): NEW_ARGV and ENV are now 'char **'.
Making them 'const' breaks the MinGW build and is not needed for
other platforms.
* src/callproc.c (emacs_spawn): ARGV and ENVP arguments are now
'char *', for the same reason.
* src/process.c (create_process): Adapt to above changes.
Diffstat (limited to 'src/process.c')
| -rw-r--r-- | src/process.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/process.c b/src/process.c index f3de9251b7a..98b575fc864 100644 --- a/src/process.c +++ b/src/process.c | |||
| @@ -2127,7 +2127,7 @@ create_process (Lisp_Object process, char **new_argv, Lisp_Object current_dir) | |||
| 2127 | 2127 | ||
| 2128 | /* This may signal an error. */ | 2128 | /* This may signal an error. */ |
| 2129 | setup_process_coding_systems (process); | 2129 | setup_process_coding_systems (process); |
| 2130 | char *const *env = make_environment_block (current_dir); | 2130 | char **env = make_environment_block (current_dir); |
| 2131 | 2131 | ||
| 2132 | pty_flag = p->pty_flag; | 2132 | pty_flag = p->pty_flag; |
| 2133 | eassert (pty_flag == ! NILP (lisp_pty_name)); | 2133 | eassert (pty_flag == ! NILP (lisp_pty_name)); |