summaryrefslogtreecommitdiff
path: root/git-compat-util.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-09-04 12:28:15 -0700
committerJunio C Hamano <gitster@pobox.com>2013-09-04 12:28:15 -0700
commit9a7eaad65ff5f6bf5c7fda427bcc2b94f6ada598 (patch)
treee81115c0c556a4f5d4d72b61c20150bb2a0ba402 /git-compat-util.h
parent4aa04a8f8d8cac0e0fb61251fbc71f292d4ab801 (diff)
parentf2be034c6918e7f5d42da5ad1cf9d3ef51c25a77 (diff)
downloadgit-9a7eaad65ff5f6bf5c7fda427bcc2b94f6ada598.tar.gz
Merge branch 'da/darwin'
* da/darwin: OS X: Fix redeclaration of die warning Makefile: Fix APPLE_COMMON_CRYPTO with BLK_SHA1 imap-send: use Apple's Security framework for base64 encoding
Diffstat (limited to 'git-compat-util.h')
-rw-r--r--git-compat-util.h10
1 files changed, 10 insertions, 0 deletions
diff --git a/git-compat-util.h b/git-compat-util.h
index 115cb1da42..d60e28dffa 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -330,6 +330,16 @@ extern NORETURN void die_errno(const char *err, ...) __attribute__((format (prin
extern int error(const char *err, ...) __attribute__((format (printf, 1, 2)));
extern void warning(const char *err, ...) __attribute__((format (printf, 1, 2)));
+#ifndef NO_OPENSSL
+#ifdef APPLE_COMMON_CRYPTO
+#include "compat/apple-common-crypto.h"
+#else
+#include <openssl/evp.h>
+#include <openssl/hmac.h>
+#endif /* APPLE_COMMON_CRYPTO */
+#include <openssl/x509v3.h>
+#endif /* NO_OPENSSL */
+
/*
* Let callers be aware of the constant return value; this can help
* gcc with -Wuninitialized analysis. We restrict this trick to gcc, though,