1131c1131
< 	const TIFFFieldInfo* fip;
---
> 	const TIFFField* fip;
1166c1166
< 	if ((fip = _TIFFFieldWithTag(tif, tag)))
---
> 	if ((fip = TIFFFieldWithTag(tif, tag)))
1269c1269
< 	if (!_TIFFMergeField(tif, faxFields, TIFFArrayCount(faxFields))) {
---
> 	if (!_TIFFMergeFields(tif, faxFields, TIFFArrayCount(faxFields))) {
1336,1337c1336,1337
< 		if (!_TIFFMergeField(tif, fax3Fields,
< 				     TIFFArrayCount(fax3Fields))) {
---
> 		if (!_TIFFMergeFields(tif, fax3Fields,
> 				      TIFFArrayCount(fax3Fields))) {
1454,1455c1454,1455
< 		if (!_TIFFMergeField(tif, fax4Fields,
< 				     TIFFArrayCount(fax4Fields))) {
---
> 		if (!_TIFFMergeFields(tif, fax4Fields,
> 				      TIFFArrayCount(fax4Fields))) {
