summaryrefslogtreecommitdiff
path: root/git-mergetool.sh
diff options
context:
space:
mode:
authorLibravatar David Aguilar <davvid@gmail.com>2013-05-19 06:23:35 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-05-20 11:15:56 -0700
commit61067954ce166e8a6fbcd109376fe2d9681ca333 (patch)
tree5cf3fe5135a4812d55233d04a23557636ccdcb5d /git-mergetool.sh
parentMakefile: add support for Apple CommonCrypto facility (diff)
downloadtgif-61067954ce166e8a6fbcd109376fe2d9681ca333.tar.xz
cache.h: eliminate SHA-1 deprecation warnings on Mac OS X
As of Mac OS X 10.7, Apple deprecated all OpenSSL functions due to OpenSSL ABI instability, thus leading to build diagnostics such as: warning: 'SHA1_Init' is deprecated (declared at /usr/include/openssl/sha.h:121) Silence the warnings by using Apple's CommonCrypto SHA-1 replacement functions for SHA1_Init(), SHA1_Update(), and SHA1_Final(). COMMON_DIGEST_FOR_OPENSSL is defined to instruct <CommonCrypto/CommonDigest.h> to provide compatibility macros associating OpenSSL SHA-1 functions with their CommonCrypto counterparts. [es: reworded commit message] Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions