show-branch: show all local heads when only giving one rev along --topics

diff --git a/git-compat-util.h b/git-compat-util.h
index 09ccebbd4958a18918d29170c9b86c91ed61cfc7..eb9b0ff32829ef62bf2d1af432742841b9720906 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
 #ifdef NO_HMAC_CTX_CLEANUP
 #define HMAC_CTX_cleanup HMAC_cleanup
 #endif