[PATCH] git-compat-util: fix NO_OPENSSL on current macOS

From: René Scharfe <l.s.r@web.de>
Date: Apr 14, 2024, 16:47 UTC
Message-ID: <3188f4e2-9744-40b1-8f05-0896b8679d25@web.de>

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