Merge branch 'dw/check-ignore-sans-index'

diff --git a/compat/mingw.h b/compat/mingw.h
index 685cd2c3d4746521e047782f9630763044e42809..9eb3b17ff071a724c269978bb6f4e3272238216c 100644 (file)
--- a/compat/mingw.h
+++ b/compat/mingw.h
@@ -322,6 +322,7 @@ static inline char *mingw_find_last_dir_sep(const char *path)
 #define find_last_dir_sep mingw_find_last_dir_sep
 #define PATH_SEP ';'
 #define PRIuMAX "I64u"
+#define PRId64 "I64d"
 
 void mingw_open_html(const char *path);
 #define open_html mingw_open_html
@@ -333,14 +334,21 @@ void mingw_open_html(const char *path);
 char **make_augmented_environ(const char *const *vars);
 void free_environ(char **env);
 
+/*
+ * A critical section used in the implementation of the spawn
+ * functions (mingw_spawnv[p]e()) and waitpid(). Intialised in
+ * the replacement main() macro below.
+ */
+extern CRITICAL_SECTION pinfo_cs;
+
 /*
  * A replacement of main() that ensures that argv[0] has a path
  * and that default fmode and std(in|out|err) are in binary mode
  */
 
 #define main(c,v) dummy_decl_mingw_main(); \
-static int mingw_main(); \
-int main(int argc, const char **argv) \
+static int mingw_main(c,v); \
+int main(int argc, char **argv) \
 { \
        extern CRITICAL_SECTION pinfo_cs; \
        _fmode = _O_BINARY; \