From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 30 May 2020 10:19:13 +0000 (+0300)
Subject: Fix mingw.org's MinGW GCC 9 warning about 'execve'
X-Git-Tag: emacs-27.1-rc1~98
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a8ad94cd2f;p=emacs.git

Fix mingw.org's MinGW GCC 9 warning about 'execve'

* nt/inc/ms-w32.h (execve) [__GNUC__ > 9]: Provide a different
prototype for mingw.org's MinGW as well, to match the GCC builtin.
---

diff --git a/nt/inc/ms-w32.h b/nt/inc/ms-w32.h
index 4693900f2dc..e5d9fd3e78e 100644
--- a/nt/inc/ms-w32.h
+++ b/nt/inc/ms-w32.h
@@ -309,7 +309,12 @@ extern intptr_t _execvp (const char *, char **);
    the code that references it is still compiled.  */
 extern int execve (const char *, char * const *, char * const *);
 #else
+/* mingw.org's MinGW GCC 9.x has the same built-in prototype...  */
+# if __GNUC__ >= 9
+extern int execve (const char *, char * const *, char * const *);
+# else
 extern intptr_t execve (const char *, char * const *, char * const *);
+# endif
 #endif
 #define tcdrain _commit
 #define fdopen	  _fdopen