Adjust for changed macro names in libgpg-error master.