diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-05-08 14:25:09 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-05-08 14:25:09 -0700 |
| commit | b9bcd76a9a5373fe12f48490355d1a2021c0583f (patch) | |
| tree | 823857d8f80f7885589f766cd523bf2e0c10dd4b /worktree.h | |
| parent | Merge branch 'es/restore-staged-from-head-by-default' (diff) | |
| parent | builtin/receive-pack: avoid generic function name hmac() (diff) | |
| download | tgif-b9bcd76a9a5373fe12f48490355d1a2021c0583f.tar.xz | |
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()
Diffstat (limited to 'worktree.h')
0 files changed, 0 insertions, 0 deletions