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

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

Closes #842

See merge request !1406
2 jobs for master in 54 seconds (queued for 3 seconds)
Status Job ID Name Coverage
  Build
passed #159277
amd64 linux
docs:sid:amd64

00:00:42

 
  Push
passed #159278
amd64 linux
push:docs:sid:amd64

00:00:12