Merge branch 'maint-1.5.6' into maint-1.6.0

diff --git a/compat/mingw.h b/compat/mingw.h
index 8ffec51e73f49a54d82dd40f1e301e9c5479ffcf..a52e657c51916a0032908a87b4d4df259547f4e8 100644 (file)
--- a/compat/mingw.h
+++ b/compat/mingw.h
@@ -223,3 +223,16 @@ void mingw_open_html(const char *path);
 char **copy_environ(void);
 void free_environ(char **env);
 char **env_setenv(char **env, const char *name);
+
+/*
+ * A replacement of main() that ensures that argv[0] has a path
+ */
+
+#define main(c,v) dummy_decl_mingw_main(); \
+static int mingw_main(); \
+int main(int argc, const char **argv) \
+{ \
+       argv[0] = xstrdup(_pgmptr); \
+       return mingw_main(argc, argv); \
+} \
+static int mingw_main(c,v)