aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2024-04-23 11:52:38 -0700
committerJunio C Hamano <gitster@pobox.com>2024-04-23 11:52:38 -0700
commitec465fcb753c991f04b6f5ec3983ad21a247dc7d (patch)
treeeef12d8dcba0ec85713ad171bb0598a1700b14ad
parent050e3349792d182ba1fd1ba25135c99103d15ade (diff)
parent44bdba2fa6b677b58d4761d41ee9b31dc98b12d0 (diff)
downloadgit-ec465fcb753c991f04b6f5ec3983ad21a247dc7d.tar.gz
Merge branch 'rs/no-openssl-compilation-fix-on-macos'
Build fix. * rs/no-openssl-compilation-fix-on-macos: git-compat-util: fix NO_OPENSSL on current macOS
-rw-r--r--git-compat-util.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/git-compat-util.h b/git-compat-util.h
index 044f87454a..ca7678a379 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -403,6 +403,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