summaryrefslogtreecommitdiff
path: root/git-compat-util.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-01-14 23:29:32 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-01-14 23:29:32 (GMT)
commit25d90d1cb72ce51407324259516843406142fe89 (patch)
tree459b0885da10de9eddeed12f49cc9ebd10f0fac8 /git-compat-util.h
parentd95f610c64b9b33957beaa1da60a489d0b4aa7fc (diff)
parent1cadad6f658bfb3ab54b25dd04bac372253473b6 (diff)
downloadgit-25d90d1cb72ce51407324259516843406142fe89.zip
git-25d90d1cb72ce51407324259516843406142fe89.tar.gz
git-25d90d1cb72ce51407324259516843406142fe89.tar.bz2
Merge branch 'tb/use-common-win32-pathfuncs-on-cygwin'
Cygwin update. * tb/use-common-win32-pathfuncs-on-cygwin: git clone <url> C:\cygwin\home\USER\repo' is working (again)
Diffstat (limited to 'git-compat-util.h')
-rw-r--r--git-compat-util.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/git-compat-util.h b/git-compat-util.h
index 09b0102..5702556 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -193,10 +193,11 @@
#endif
#if defined(__CYGWIN__)
-#include "compat/cygwin.h"
+#include "compat/win32/path-utils.h"
#endif
#if defined(__MINGW32__)
/* pull in Windows compatibility stuff */
+#include "compat/win32/path-utils.h"
#include "compat/mingw.h"
#elif defined(_MSC_VER)
#include "compat/msvc.h"