2 files changed, 4 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 1007bb88..8ef35128 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2019-02-02  Eli Zaretskii  <eliz@gnu.org>
 
+	* debug.c (execvp) [__MINGW32__]: Redirect to w32_execvp.
+	(restart): No need for MinGW-specific code anymore.
+
 	* nonposix.h: If setlocale is already a defined macro, #undef it
 	before redefining.  This avoids compilation warnings if someone
 	tries to compile Gawk with Gettext's libintl.h, which redirects
diff --git a/debug.c b/debug.c
index 981f95b2..452b6b6f 100644
--- a/debug.c
+++ b/debug.c
@@ -31,6 +31,7 @@
 #endif
 
 #ifdef __MINGW32__
+#define execvp(p,a) w32_execvp(p,a)
 int w32_execvp(const char *, char **);
 #endif
 
@@ -2918,11 +2919,7 @@ restart(bool run)
 	close_all();
 
 	/* start a new process replacing the current process */
-#ifdef __MINGW32__
-	w32_execvp(d_argv[0], d_argv);
-#else
 	execvp(d_argv[0], d_argv);
-#endif
 
 	/* execvp failed !!! */
 	fprintf(out_fp, _("Failed to restart debugger"));