Merge branch 'cb/avoid-colliding-with-netbsd-hmac'
authorJunio C Hamano <gitster@pobox.com>
Fri, 8 May 2020 21:25:09 +0000 (14:25 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 8 May 2020 21:25:09 +0000 (14:25 -0700)
commitb9bcd76a9a5373fe12f48490355d1a2021c0583f
tree823857d8f80f7885589f766cd523bf2e0c10dd4b
parent4c2941a5fa6c99cb204c48d2fe6f3b55a7211012
parent3013118eb86f1c9e3d9b669bc23e770ee6e04174
Merge branch 'cb/avoid-colliding-with-netbsd-hmac'

The <stdlib.h> header on NetBSD brings in its own definition of
hmac() function (eek), which conflicts with our own and unrelated
function with the same name.  Our function has been renamed to work
around the issue.

* cb/avoid-colliding-with-netbsd-hmac:
  builtin/receive-pack: avoid generic function name hmac()
builtin/receive-pack.c