From: "René Scharfe" <l.s.r@web.de>
To: Git List <git@vger.kernel.org>
Cc: Eric Sunshine <sunshine@sunshineco.com>
Subject: [PATCH] git-compat-util: fix NO_OPENSSL on current macOS
Date: Sun, 14 Apr 2024 18:47:54 +0200 [thread overview]
Message-ID: <3188f4e2-9744-40b1-8f05-0896b8679d25@web.de> (raw)
b195aa00c1 (git-compat-util: suppress unavoidable Apple-specific
deprecation warnings, 2014-12-16) started to define
__AVAILABILITY_MACROS_USES_AVAILABILITY in git-compat-util.h. On
current versions it is already defined (e.g. on macOS 14.4.1). Undefine
it before redefining it to avoid a compilation error.
Signed-off-by: René Scharfe <l.s.r@web.de>
---
On my system I can remove the whole ifdef __APPLE__ section, as the OS
doesn't include the deprecated OpenSSL anymore. I get a current version
via Homebrew, which doesn't throw any deprecation warnings, of course.
Not sure if this is the right fix, as the no longer needed section still
undefines __AVAILABILITY_MACROS_USES_AVAILABILITY at the end, which we
may want to keep instead. But compilation succeeds and tests pass, so
perhaps it's fine.
git-compat-util.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/git-compat-util.h b/git-compat-util.h
index 7c2a6538e5..1a4f5a30c3 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -391,6 +391,7 @@ char *gitdirname(char *);
#ifndef NO_OPENSSL
#ifdef __APPLE__
+#undef __AVAILABILITY_MACROS_USES_AVAILABILITY
#define __AVAILABILITY_MACROS_USES_AVAILABILITY 0
#include <AvailabilityMacros.h>
#undef DEPRECATED_ATTRIBUTE
--
2.44.0
next reply other threads:[~2024-04-14 16:47 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-14 16:47 René Scharfe [this message]
2024-04-18 17:21 ` [PATCH] git-compat-util: fix NO_OPENSSL on current macOS Eric Sunshine
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=3188f4e2-9744-40b1-8f05-0896b8679d25@web.de \
--to=l.s.r@web.de \
--cc=git@vger.kernel.org \
--cc=sunshine@sunshineco.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.
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).