From: Mark Andrews <marka@isc.org>
Date: Tue, 29 Jan 2019 02:32:56 +0000 (-0500)
Subject: Merge branch '842-broken-build' into 'master'
X-Git-Tag: v9.13.6~33
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8672f5cb5a10048267ec0eb5891ee319be713cb4;p=thirdparty%2Fbind9.git

Merge branch '842-broken-build' into 'master'

rename struct members to avoid a name collision on BSD and MacOS

Closes #842

See merge request isc-projects/bind9!1406
---

8672f5cb5a10048267ec0eb5891ee319be713cb4