From: René Scharfe <l.s.r@web.de>
Date: Sun, 14 Apr 2024 16:47:54 +0000 (+0200)
Subject: git-compat-util: fix NO_OPENSSL on current macOS
X-Git-Tag: v2.45.0-rc1~13^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=44bdba2fa6b677b58d4761d41ee9b31dc98b12d0;p=thirdparty%2Fgit.git

git-compat-util: fix NO_OPENSSL on current macOS

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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/git-compat-util.h b/git-compat-util.h
index 9bfd7ce76d..64bbdae7f1 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -358,6 +358,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