Merge branch 'tb/core-eol-fix' into maint

diff --git a/compat/mingw.h b/compat/mingw.h
index edec9e0253560445db6863ab3ebdd7307e486339..69bb43dc35d4c28724f007d9684715ec40421542 100644 (file)
--- a/compat/mingw.h
+++ b/compat/mingw.h
@@ -417,9 +417,6 @@ int mingw_offset_1st_component(const char *path);
 void mingw_open_html(const char *path);
 #define open_html mingw_open_html
 
-void mingw_mark_as_git_dir(const char *dir);
-#define mark_as_git_dir mingw_mark_as_git_dir
-
 /**
  * Converts UTF-8 encoded string to UTF-16LE.
  *