Merge branch 'rs/simplify-transport-get'

diff --git a/git-compat-util.h b/git-compat-util.h
index b763a4e2693a5f08977132513196e78951868d5b..dcecd857f159357ff7d79cde218895f43795d944 100644 (file)
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -212,8 +212,12 @@ extern char *gitbasename(char *);
 #endif
 
 #ifndef NO_OPENSSL
+#define __AVAILABILITY_MACROS_USES_AVAILABILITY 0
+#define MAC_OS_X_VERSION_MIN_REQUIRED MAC_OS_X_VERSION_10_6
 #include <openssl/ssl.h>
 #include <openssl/err.h>
+#undef MAC_OS_X_VERSION_MIN_REQUIRED
+#undef __AVAILABILITY_MACROS_USES_AVAILABILITY
 #endif
 
 /* On most systems <netdb.h> would have given us this, but