diff options
| author | Eli Zaretskii | 2020-05-30 13:56:20 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2020-05-30 13:56:20 +0300 |
| commit | 360d7c716dc49aeaa62bd2174e803e0a3eaeaa1b (patch) | |
| tree | 798fb661692a146c5f4bf49d339086d648856b6f /src | |
| parent | f42db4b6e1598c12924cce4bbe4d67e6d86b7963 (diff) | |
| download | emacs-360d7c716dc49aeaa62bd2174e803e0a3eaeaa1b.tar.gz emacs-360d7c716dc49aeaa62bd2174e803e0a3eaeaa1b.zip | |
Remove private prototype for 'execve' and its uses in MinGW build
* src/sysdep.c (emacs_exec_file): Don't compile this function
anymore on WINDOWSNT, since it is not used there. This function
was the only reason for having 'execve' prototype in ms-w32.h.
* nt/inc/ms-w32.h (execve): Remove prototype and the MinGW64 vs
ming.org mess that it causes.
Diffstat (limited to 'src')
| -rw-r--r-- | src/sysdep.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/sysdep.c b/src/sysdep.c index 86e7c20cd01..cbd306a6b67 100644 --- a/src/sysdep.c +++ b/src/sysdep.c | |||
| @@ -199,6 +199,7 @@ maybe_disable_address_randomization (int argc, char **argv) | |||
| 199 | } | 199 | } |
| 200 | #endif | 200 | #endif |
| 201 | 201 | ||
| 202 | #ifndef WINDOWSNT | ||
| 202 | /* Execute the program in FILE, with argument vector ARGV and environ | 203 | /* Execute the program in FILE, with argument vector ARGV and environ |
| 203 | ENVP. Return an error number if unsuccessful. This is like execve | 204 | ENVP. Return an error number if unsuccessful. This is like execve |
| 204 | except it reenables ASLR in the executed program if necessary, and | 205 | except it reenables ASLR in the executed program if necessary, and |
| @@ -215,6 +216,8 @@ emacs_exec_file (char const *file, char *const *argv, char *const *envp) | |||
| 215 | return errno; | 216 | return errno; |
| 216 | } | 217 | } |
| 217 | 218 | ||
| 219 | #endif /* !WINDOWSNT */ | ||
| 220 | |||
| 218 | /* If FD is not already open, arrange for it to be open with FLAGS. */ | 221 | /* If FD is not already open, arrange for it to be open with FLAGS. */ |
| 219 | static void | 222 | static void |
| 220 | force_open (int fd, int flags) | 223 | force_open (int fd, int flags) |