git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: "Carlo Marcelo Arenas Belón" <carenas@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Johannes Sixt <j6t@kdbg.org>
Subject: js/win-lazyload-buildfix (was Re: What's cooking in git.git (Sep 2021, #07; Thu, 23))
Date: Fri, 24 Sep 2021 02:14:03 -0700	[thread overview]
Message-ID: <YU2W24RUaN4OHrcn@carlos-mbp.lan> (raw)
In-Reply-To: <xmqqa6k2yj1j.fsf@gitster.g>

On Thu, Sep 23, 2021 at 04:22:00PM -0700, Junio C Hamano wrote:
> 
> * js/win-lazyload-buildfix (2021-09-23) 2 commits
>  - lazyload.h: use an even more generic function pointer than FARPROC
>  - lazyload.h: fix warnings about mismatching function pointer types
> 
>  Compilation fix.
> 
>  Will merge to 'next'.

Sorry to hijack this thread with this minor point, but I was hoping[1]
from a reroll of this topic from Hannes.

Alternatively the patch below the scissors would be nice to squash or
it will be harder to fix later.

Carlo

CC: +Hannes
[1] https://lore.kernel.org/git/CAPUEspivB=07OponiMrfXFBrC+L7qjSUuZEV9q-Ug5Z_ShnFNA@mail.gmail.com/
----- >8 -----
Subject: [PATCH] fixup! lazyload.h: fix warnings about mismatching function
 pointer types

The original patch will require the declaration this macro creates
to be moved to the end of the local variables or will trigger
-Wdeclaration-after-statement because it will likely end in ";;" if
the macro call has one, as it is common.

Remove trailing ';' from macro definition, for easy of use.

Signed-off-by: Carlo Marcelo Arenas Belón <carenas@gmail.com>
---
 compat/win32/lazyload.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compat/win32/lazyload.h b/compat/win32/lazyload.h
index c688e545ad..2b3637135f 100644
--- a/compat/win32/lazyload.h
+++ b/compat/win32/lazyload.h
@@ -29,7 +29,7 @@ struct proc_addr {
 	static struct proc_addr proc_addr_##function = \
 	{ #dll, #function, NULL, 0 }; \
 	typedef rettype (WINAPI *proc_type_##function)(__VA_ARGS__); \
-	static proc_type_##function function;
+	static proc_type_##function function
 
 /*
  * Loads a function from a DLL (once-only).
-- 
2.33.0.955.gee03ddbf0e


  parent reply	other threads:[~2021-09-24  9:14 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-09-23 23:22 What's cooking in git.git (Sep 2021, #07; Thu, 23) Junio C Hamano
2021-09-23 23:52 ` Taylor Blau
2021-09-24  1:30 ` Elijah Newren
2021-09-24  9:14 ` Carlo Marcelo Arenas Belón [this message]
2021-09-24 15:38   ` js/win-lazyload-buildfix (was Re: What's cooking in git.git (Sep 2021, #07; Thu, 23)) Junio C Hamano
2021-09-24 21:30   ` Johannes Sixt
2021-09-26 16:00 ` What's cooking in git.git (Sep 2021, #07; Thu, 23) Andrzej Hunt
2021-09-27 17:33   ` Junio C Hamano

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

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=YU2W24RUaN4OHrcn@carlos-mbp.lan \
    --to=carenas@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=j6t@kdbg.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.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

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).