From: Junio C Hamano <gitster@pobox.com>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: Mike Hommey <mh@glandium.org>, git@vger.kernel.org
Subject: Re: [PATCH] Win32: Fix building with NO_UNIX_SOCKETS
Date: Fri, 03 May 2024 08:43:34 -0700 [thread overview]
Message-ID: <xmqqv83uaok9.fsf@gitster.g> (raw)
In-Reply-To: <47580fe5-6934-9a76-f927-d66c6c338143@gmx.de> (Johannes Schindelin's message of "Fri, 3 May 2024 11:26:04 +0200 (CEST)")
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
>>
>>
prev parent reply other threads:[~2024-05-03 15:43 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
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 message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqv83uaok9.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=mh@glandium.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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 read-only IMAP folder(s) and NNTP newsgroup(s).