From: "Carlo Marcelo Arenas Belón" <carenas@gmail.com>
To: git@vger.kernel.org
Cc: j6t@kdbg.org, gitster@pobox.com,
"Carlo Marcelo Arenas Belón" <carenas@gmail.com>
Subject: [PATCH v3 0/2] js/win-lazyload-buildfix
Date: Sun, 26 Sep 2021 03:05:10 -0700 [thread overview]
Message-ID: <20210926100512.58924-1-carenas@gmail.com> (raw)
In-Reply-To: <20210923065251.21363-1-carenas@gmail.com>
To easy the maintainer reroll of this branch with the fixup[1] squashed
and the suggested[2] cleanup in the second patch to minimize change and
readiness for next.
Carlo Marcelo Arenas Belón (1):
lazyload.h: use an even more generic function pointer than FARPROC
Johannes Sixt (1):
lazyload.h: fix warnings about mismatching function pointer types
compat/win32/lazyload.h | 14 +++++++++-----
config.mak.dev | 1 -
2 files changed, 9 insertions(+), 6 deletions(-)
[1] https://lore.kernel.org/git/3f963bba-3197-8c52-9828-6d78ef1d25b1@kdbg.org/T/#u
[2] https://lore.kernel.org/git/CAPUEspivB=07OponiMrfXFBrC+L7qjSUuZEV9q-Ug5Z_ShnFNA@mail.gmail.com/
Range-diff against v2:
1: 79354f549e ! 1: c389b7ad9d lazyload.h: fix warnings about mismatching function pointer types
@@ Commit message
happy. A cast is fine in these cases because they are generic function
pointer values that have been looked up in a DLL.
+ Helped-by: Carlo Marcelo Arenas Belón <carenas@gmail.com>
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
- Signed-off-by: Junio C Hamano <gitster@pobox.com>
## compat/win32/lazyload.h ##
@@ compat/win32/lazyload.h: struct proc_addr {
@@ compat/win32/lazyload.h: struct proc_addr {
{ #dll, #function, NULL, 0 }; \
- static rettype (WINAPI *function)(__VA_ARGS__)
+ 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: 912c443bde ! 2: b1efbe2c89 lazyload.h: use an even more generic function pointer than FARPROC
@@ Commit message
enabled, 2021-09-03), as it will be no longer needed.
Signed-off-by: Carlo Marcelo Arenas Belón <carenas@gmail.com>
- Signed-off-by: Junio C Hamano <gitster@pobox.com>
-
- ## compat/mingw.c ##
-@@ compat/mingw.c: enum EXTENDED_NAME_FORMAT {
-
- static char *get_extended_user_info(enum EXTENDED_NAME_FORMAT type)
- {
-- DECLARE_PROC_ADDR(secur32.dll, BOOL, GetUserNameExW,
-- enum EXTENDED_NAME_FORMAT, LPCWSTR, PULONG);
- static wchar_t wbuffer[1024];
- DWORD len;
-+ DECLARE_PROC_ADDR(secur32.dll, BOOL, GetUserNameExW,
-+ enum EXTENDED_NAME_FORMAT, LPCWSTR, PULONG);
-
- if (!INIT_PROC_ADDR(GetUserNameExW))
- return NULL;
## compat/win32/lazyload.h ##
@@
@@ config.mak.dev: DEVELOPER_CFLAGS += -pedantic
endif
endif
DEVELOPER_CFLAGS += -Wdeclaration-after-statement
-
- ## t/helper/test-drop-caches.c ##
-@@ t/helper/test-drop-caches.c: static int cmd_dropcaches(void)
- {
- HANDLE hProcess = GetCurrentProcess();
- HANDLE hToken;
-- DECLARE_PROC_ADDR(ntdll.dll, DWORD, NtSetSystemInformation, INT, PVOID, ULONG);
- SYSTEM_MEMORY_LIST_COMMAND command;
- int status;
-+ DECLARE_PROC_ADDR(ntdll.dll, DWORD, NtSetSystemInformation, INT, PVOID, ULONG);
-
- if (!OpenProcessToken(hProcess, TOKEN_QUERY | TOKEN_ADJUST_PRIVILEGES, &hToken))
- return error("Can't open current process token");
--
2.33.0.955.gee03ddbf0e
next prev parent reply other threads:[~2021-09-26 10:05 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-22 19:56 [PATCH cb/pedantic-build-for-developers] lazyload.h: fix warnings about mismatching function pointer types Johannes Sixt
2021-09-22 20:16 ` Carlo Arenas
2021-09-22 21:21 ` Johannes Sixt
2021-09-23 6:20 ` Carlo Arenas
2021-09-23 6:03 ` [PATCH] lazyload.h: use an even more generic function pointer than FARPROC Carlo Marcelo Arenas Belón
2021-09-23 6:33 ` Johannes Sixt
2021-09-23 6:49 ` Carlo Arenas
2021-09-23 6:52 ` [PATCH v2] " Carlo Marcelo Arenas Belón
2021-09-26 10:05 ` Carlo Marcelo Arenas Belón [this message]
2021-09-26 10:05 ` [PATCH v3 1/2] lazyload.h: fix warnings about mismatching function pointer types Carlo Marcelo Arenas Belón
2021-09-27 2:58 ` Eric Sunshine
2021-09-26 10:05 ` [PATCH v3 2/2] lazyload.h: use an even more generic function pointer than FARPROC Carlo Marcelo Arenas Belón
2021-09-27 16:35 ` Junio C Hamano
2021-09-27 18:50 ` Carlo Arenas
2021-09-27 20:13 ` Junio C Hamano
2021-09-29 0:48 ` [PATCH v4 0/3] js/win-lazyload-buildfix Carlo Marcelo Arenas Belón
2021-09-29 0:48 ` [PATCH v4 1/3] lazyload.h: fix warnings about mismatching function pointer types Carlo Marcelo Arenas Belón
2021-09-29 0:48 ` [PATCH v4 2/3] lazyload.h: use an even more generic function pointer than FARPROC Carlo Marcelo Arenas Belón
2021-09-29 0:48 ` [PATCH v4 3/3] Makefile: restrict -Wpedantic and -Wno-pedantic-ms-format better Carlo Marcelo Arenas Belón
2021-09-29 1:14 ` Ramsay Jones
2021-09-29 3:19 ` [PATCH v5 0/3] js/win-lazyload-buildfix Carlo Marcelo Arenas Belón
2021-09-29 3:19 ` [PATCH v5 1/3] lazyload.h: fix warnings about mismatching function pointer types Carlo Marcelo Arenas Belón
2021-09-29 3:19 ` [PATCH v5 2/3] lazyload.h: use an even more generic function pointer than FARPROC Carlo Marcelo Arenas Belón
2021-09-29 3:19 ` [PATCH v5 3/3] Makefile: restrict -Wpedantic and -Wno-pedantic-ms-format better Carlo Marcelo Arenas Belón
2021-09-23 21:00 ` [PATCH cb/pedantic-build-for-developers] lazyload.h: fix warnings about mismatching function pointer types Carlo Arenas
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=20210926100512.58924-1-carenas@gmail.com \
--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).