Merge branch 'as/diff-options-grammofix'

diff --git a/git-compat-util.h b/git-compat-util.h
index 047172d173c495d7e723a00db5d563113978f917..db9c22de7693af4e905fdeb0a1766ba4469eda94 100644 (file)
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -189,6 +189,9 @@
 #include <sys/sysctl.h>
 #endif
 
+#if defined(__CYGWIN__)
+#include "compat/cygwin.h"
+#endif
 #if defined(__MINGW32__)
 /* pull in Windows compatibility stuff */
 #include "compat/mingw.h"