Merge branch 'jc/grep-commandline-vs-configuration' into maint

diff --git a/compat/mingw.h b/compat/mingw.h
index 9a8803b876a1ed38aca34e83c3859e607bdd17e7..ef22cbb05d140a210bd348ea1234fc60cdf09da8 100644 (file)
--- a/compat/mingw.h
+++ b/compat/mingw.h
@@ -73,6 +73,9 @@ typedef int pid_t;
 #ifndef ECONNABORTED
 #define ECONNABORTED WSAECONNABORTED
 #endif
+#ifndef ENOTSOCK
+#define ENOTSOCK WSAENOTSOCK
+#endif
 
 struct passwd {
        char *pw_name;