From: Jeff King <peff@peff.net>
To: Bagas Sanjaya <bagasdotme@gmail.com>
Cc: Junio C Hamano <gitster@pobox.com>,
git@vger.kernel.org,
Fabrice Fontaine <fontaine.fabrice@gmail.com>
Subject: Re: [PATCH] git-compat-util: avoid redefining system function names
Date: Fri, 2 Dec 2022 06:05:38 -0500 [thread overview]
Message-ID: <Y4ncAhIqHkckMljb@coredump.intra.peff.net> (raw)
In-Reply-To: <Y4nN2h4FIYGNjCSI@debian.me>
On Fri, Dec 02, 2022 at 05:05:14PM +0700, Bagas Sanjaya wrote:
> I got many of redefinition warnings when cross-compiling on Buildroot
> with the patch above, like:
>
> In file included from cache.h:4,
> from common-main.c:1:
> git-compat-util.h:1485: warning: "getc_unlocked" redefined
> 1485 | #define getc_unlocked(fh) getc(fh)
> |
> In file included from git-compat-util.h:216,
> from cache.h:4,
> from common-main.c:1:
> /home/bagas/repo/buildroot/output/host/aarch64-buildroot-linux-uclibc/sysroot/usr/include/stdio.h:835: note: this is the location of the previous definition
> 835 | #define getc_unlocked(_fp) __GETC_UNLOCKED(_fp)
I imagine you'd get that without my patch, too, since I didn't touch the
getc_unlocked() line at all. Or maybe it simply didn't get that far
because of the other redeclared functions.
Anyway, we probably want this on top of the other patch.
-- >8 --
Subject: [PATCH] git-compat-util: undefine system names before redeclaring
them
When we define a macro to point a system function (e.g., flockfile) to
our custom wrapper, we should make sure that the system did not already
define it as a macro. This is rarely a problem, but can cause
compilation failures if both of these are true:
- we decide to define our own wrapper even though the system provides
the function; we know this happens at least with uclibc, which may
declare flockfile, etc, without _POSIX_THREAD_SAFE_FUNCTIONS
- the system version is declared as a macro; we know this happens at
least with uclibc's version of getc_unlocked()
So just handling getc_unlocked() would be sufficient to deal with the
real-world case we've seen. But since it's easy to do, we may as well be
defensive about the other macro wrappers added in the previous patch.
Signed-off-by: Jeff King <peff@peff.net>
---
There may be other similar cases lurking throughout the code base, but I
don't think it's worth anybody's time to go looking for them. If one of
them triggers on a real platform, we can deal with it then.
git-compat-util.h | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/git-compat-util.h b/git-compat-util.h
index 83ec7b7941..76e4b11131 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -346,6 +346,7 @@ static inline int git_setitimer(int which UNUSED,
struct itimerval *newvalue UNUSED) {
return 0; /* pretend success */
}
+#undef setitimer
#define setitimer(which,value,ovalue) git_setitimer(which,value,ovalue)
#endif
@@ -1480,6 +1481,9 @@ static inline void git_funlockfile(FILE *fh UNUSED)
{
; /* nothing */
}
+#undef flockfile
+#undef funlockfile
+#undef getc_unlocked
#define flockfile(fh) git_flockfile(fh)
#define funlockfile(fh) git_funlockfile(fh)
#define getc_unlocked(fh) getc(fh)
--
2.39.0.rc1.456.gb53e2f823e
next prev parent reply other threads:[~2022-12-02 11:07 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-25 9:23 [PATCH] git-compat-util.h: Fix build without threads Bagas Sanjaya
2022-11-25 23:47 ` Ævar Arnfjörð Bjarmason
2022-11-28 5:04 ` Jeff King
2022-11-29 3:30 ` Bagas Sanjaya
2022-11-29 3:46 ` Bagas Sanjaya
2022-11-28 5:01 ` Jeff King
2022-11-30 21:15 ` [PATCH] git-compat-util: avoid redefining system function names Jeff King
2022-12-02 10:05 ` Bagas Sanjaya
2022-12-02 11:05 ` Jeff King [this message]
2022-12-03 8:02 ` Bagas Sanjaya
2022-12-07 8:33 ` Bagas Sanjaya
2022-12-07 13:00 ` Jeff King
2022-12-02 11:31 ` Ævar Arnfjörð Bjarmason
2022-12-02 22:50 ` Jeff King
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=Y4ncAhIqHkckMljb@coredump.intra.peff.net \
--to=peff@peff.net \
--cc=bagasdotme@gmail.com \
--cc=fontaine.fabrice@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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).