diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-01-07 22:08:30 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-01-07 22:08:30 +0100 |
| commit | 74a101eb48b72fad372cfa15669a3b6c55fb1046 (patch) | |
| tree | 1319ef4691b0e9096ccc3667ac74e03365118dce /git-compat-util.h | |
| parent | Merge branch 'sb/t5400-remove-unused' (diff) | |
| parent | git-compat-util: suppress unavoidable Apple-specific deprecation warnings (diff) | |
| download | git-74a101eb48b72fad372cfa15669a3b6c55fb1046.tar.xz git-74a101eb48b72fad372cfa15669a3b6c55fb1046.zip | |
Merge branch 'es/squelch-openssl-warnings-on-macosx'
Squelch useless compiler warnings on Mac OS X.
* es/squelch-openssl-warnings-on-macosx:
git-compat-util: suppress unavoidable Apple-specific deprecation warnings
Diffstat (limited to 'git-compat-util.h')
| -rw-r--r-- | git-compat-util.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/git-compat-util.h b/git-compat-util.h index b763a4e269..dcecd857f1 100644 --- 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 |