* [PATCH] Win32: Fix building with NO_UNIX_SOCKETS
@ 2024-05-03 9:14 Mike Hommey
2024-05-03 9:26 ` Johannes Schindelin
0 siblings, 1 reply; 3+ messages in thread
From: Mike Hommey @ 2024-05-03 9:14 UTC (permalink / raw)
To: git; +Cc: gitster, Johannes.Schindelin, Mike Hommey
After 2406bf5fc5 it fails with:
compat/mingw.c:4160:5: error: no previous prototype for function 'mingw_have_unix_sockets' [-Werror,-Wmissing-prototypes]
4160 | int mingw_have_unix_sockets(void)
| ^
because the prototype is behind `ifndef NO_UNIX_SOCKETS`
Signed-off-by: Mike Hommey <mh@glandium.org>
---
compat/mingw.c | 2 ++
1 file changed, 2 insertions(+)
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
--
2.45.0.1.ge6f3e402ce
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] Win32: Fix building with NO_UNIX_SOCKETS
2024-05-03 9:14 [PATCH] Win32: Fix building with NO_UNIX_SOCKETS Mike Hommey
@ 2024-05-03 9:26 ` Johannes Schindelin
2024-05-03 15:43 ` Junio C Hamano
0 siblings, 1 reply; 3+ messages in thread
From: Johannes Schindelin @ 2024-05-03 9:26 UTC (permalink / raw)
To: Mike Hommey; +Cc: git, gitster
Hi Mike,
On Fri, 3 May 2024, Mike Hommey wrote:
> After 2406bf5fc5 it fails with:
>
> compat/mingw.c:4160:5: error: no previous prototype for function 'mingw_have_unix_sockets' [-Werror,-Wmissing-prototypes]
> 4160 | int mingw_have_unix_sockets(void)
> | ^
>
> because the prototype is behind `ifndef NO_UNIX_SOCKETS`
Good catch!
Acked-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Thank you,
Johannes
>
> Signed-off-by: Mike Hommey <mh@glandium.org>
> ---
> compat/mingw.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> 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
> --
> 2.45.0.1.ge6f3e402ce
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] Win32: Fix building with NO_UNIX_SOCKETS
2024-05-03 9:26 ` Johannes Schindelin
@ 2024-05-03 15:43 ` Junio C Hamano
0 siblings, 0 replies; 3+ messages in thread
From: Junio C Hamano @ 2024-05-03 15:43 UTC (permalink / raw)
To: Johannes Schindelin; +Cc: Mike Hommey, git
Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
> Hi Mike,
>
> On Fri, 3 May 2024, Mike Hommey wrote:
>
>> After 2406bf5fc5 it fails with:
>>
>> compat/mingw.c:4160:5: error: no previous prototype for function 'mingw_have_unix_sockets' [-Werror,-Wmissing-prototypes]
>> 4160 | int mingw_have_unix_sockets(void)
>> | ^
>>
>> because the prototype is behind `ifndef NO_UNIX_SOCKETS`
>
> Good catch!
>
> Acked-by: Johannes Schindelin <johannes.schindelin@gmx.de>
>
> Thank you,
> Johannes
Thanks, both. Will queue.
>
>>
>> Signed-off-by: Mike Hommey <mh@glandium.org>
>> ---
>> compat/mingw.c | 2 ++
>> 1 file changed, 2 insertions(+)
>>
>> 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
>> --
>> 2.45.0.1.ge6f3e402ce
>>
>>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-05-03 15:43 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-05-03 9:14 [PATCH] Win32: Fix building with NO_UNIX_SOCKETS Mike Hommey
2024-05-03 9:26 ` Johannes Schindelin
2024-05-03 15:43 ` Junio C Hamano
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).