From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 5 Mar 2015 21:13:06 +0000 (-0800)
Subject: Merge branch 'es/squelch-openssl-warnings-on-macosx' into maint
X-Git-Tag: v2.3.2~14
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/e591339ce7632f3c9000f0fde8ee4813f061a11e?ds=inline;hp=--cc

Merge branch 'es/squelch-openssl-warnings-on-macosx' into maint

An earlier workaround to squelch unhelpful deprecation warnings
from the complier on Mac OSX unnecessarily set minimum required
version of the OS, which the user might want to raise (or lower)
for other reasons.

* es/squelch-openssl-warnings-on-macosx:
git-compat-util: do not step on MAC_OS_X_VERSION_MIN_REQUIRED
---

e591339ce7632f3c9000f0fde8ee4813f061a11e
diff --cc git-compat-util.h
index 553fc01762,46563326f0..2ce96d5cb7
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@@ -212,15 -211,15 +212,18 @@@ extern char *gitbasename(char *)
  #endif
  
  #ifndef NO_OPENSSL
+ #ifdef __APPLE__
  #define __AVAILABILITY_MACROS_USES_AVAILABILITY 0
- #define MAC_OS_X_VERSION_MIN_REQUIRED MAC_OS_X_VERSION_10_6
+ #include <AvailabilityMacros.h>
+ #undef DEPRECATED_ATTRIBUTE
+ #define DEPRECATED_ATTRIBUTE
+ #undef __AVAILABILITY_MACROS_USES_AVAILABILITY
+ #endif
  #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
  #endif
  
  /* On most systems <netdb.h> would have given us this, but