summaryrefslogtreecommitdiff
path: root/git-compat-util.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2021-09-23 20:44:48 (GMT)
committerJunio C Hamano <gitster@pobox.com>2021-09-23 20:44:48 (GMT)
commitc2e799012b3657f4f91560d299b5606c297e7cf7 (patch)
tree30819b9395fcdf094c24c8c70ed93f82661e071d /git-compat-util.h
parent0e35107e7dde88a8d53a98773afbbbd23cd694ae (diff)
parentbb390b1f49406d967e8bf3401337cf1d9535f820 (diff)
downloadgit-c2e799012b3657f4f91560d299b5606c297e7cf7.zip
git-c2e799012b3657f4f91560d299b5606c297e7cf7.tar.gz
git-c2e799012b3657f4f91560d299b5606c297e7cf7.tar.bz2
Merge branch 'cb/unix-sockets-with-windows'
Adjust credential-cache helper to Windows. * cb/unix-sockets-with-windows: git-compat-util: include declaration for unix sockets in windows credential-cache: check for windows specific errors t0301: fixes for windows compatibility
Diffstat (limited to 'git-compat-util.h')
-rw-r--r--git-compat-util.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/git-compat-util.h b/git-compat-util.h
index ddc65ff..7c99eef 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -160,6 +160,9 @@
# endif
#define WIN32_LEAN_AND_MEAN /* stops windows.h including winsock.h */
#include <winsock2.h>
+#ifndef NO_UNIX_SOCKETS
+#include <afunix.h>
+#endif
#include <windows.h>
#define GIT_WINDOWS_NATIVE
#endif