diff options
| author | René Scharfe <l.s.r@web.de> | 2024-04-14 18:47:54 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-04-15 11:01:31 -0700 |
| commit | 44bdba2fa6b677b58d4761d41ee9b31dc98b12d0 (patch) | |
| tree | 26e36ca79dfbf0b6a15990cc0bdd9f04570392a4 | |
| parent | ec583449067bab5b800ecc63926f35c9dae96fa1 (diff) | |
| download | git-44bdba2fa6b677b58d4761d41ee9b31dc98b12d0.tar.gz | |
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>
| -rw-r--r-- | git-compat-util.h | 1 |
1 files changed, 1 insertions, 0 deletions
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 |