aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2024-05-31 15:28:21 -0700
committerJunio C Hamano <gitster@pobox.com>2024-05-31 15:28:21 -0700
commit6e90e88de975fe823f359cebf6d1ff9fe8f238c9 (patch)
treedee06dab1e98ef759e9f6fc406e0dafc5c53a2e8
parentMerge branch 'jt/doc-submitting-rerolled-series' into maint-2.45 (diff)
parentwin32: fix building with NO_UNIX_SOCKETS (diff)
downloadgit-6e90e88de975fe823f359cebf6d1ff9fe8f238c9.tar.gz
git-6e90e88de975fe823f359cebf6d1ff9fe8f238c9.zip
Merge branch 'ma/win32-unix-domain-socket' into maint-2.45
Build fix. * ma/win32-unix-domain-socket: win32: fix building with NO_UNIX_SOCKETS
-rw-r--r--compat/mingw.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/compat/mingw.c b/compat/mingw.c
index 4876344b5b..6b06ea540f 100644
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -3159,6 +3159,7 @@ int uname(struct utsname *buf)
return 0;
}
+#ifndef NO_UNIX_SOCKETS
int mingw_have_unix_sockets(void)
{
SC_HANDLE scm, srvc;
@@ -3177,3 +3178,4 @@ int mingw_have_unix_sockets(void)
}
return ret;
}
+#endif