Merge branch 'ma/win32-unix-domain-socket' into maint-2.45

gitster · gitster · commit 6e90e88de975 · 2024-05-31T15:28:21.000-07:00
Build fix.

* ma/win32-unix-domain-socket:
  win32: fix building with NO_UNIX_SOCKETS
diff --git 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

Original file line number	Diff line number	Diff line change
`@@ -3159,6 +3159,7 @@ int uname(struct utsname *buf)`
`3159`	`3159`	`return 0;`
`3160`	`3160`	`}`
`3161`	`3161`
	`3162`	`+#ifndef NO_UNIX_SOCKETS`
`3162`	`3163`	`int mingw_have_unix_sockets(void)`
`3163`	`3164`	`{`
`3164`	`3165`	`SC_HANDLE scm, srvc;`
`@@ -3177,3 +3178,4 @@ int mingw_have_unix_sockets(void)`
`3177`	`3178`	`}`
`3178`	`3179`	`return ret;`
`3179`	`3180`	`}`
	`3181`	`+#endif`