Firefox build break due to undeclared types?

["Ian D. Leroux" <idleroux%fastmail.fm@localhost>]

For the last couple of days www/firefox has been failing to build for
me (on amd64 -current from a few weeks ago, with options "gtk3 oss").
The build chokes on nsNavHistoryQuery.cpp with several screenfuls of
errors about undeclared types  (see below for example).  Indeed,
grepping for Int64QuerySetter or Uint16OptionsSetter (in both the
pkgsrc directory and work/.buildlink) finds no definitions.  Where are
these types meant to come from and where have the definitions gone?

/build/pkgsrc/www/firefox/work/firefox-52.0.2/toolkit/components/places/nsNavHistoryQuery.cpp: At global scope:
/build/pkgsrc/www/firefox/work/firefox-52.0.2/toolkit/components/places/nsNavHistoryQuery.cpp:1648:19: error: 'Uint32OptionsSetter' has not been declared
                   Uint32OptionsSetter setter)
                   ^
/build/pkgsrc/www/firefox/work/firefox-52.0.2/toolkit/components/places/nsNavHistoryQuery.cpp: In function 'void SetOptionsKeyUint32(const nsCString&, nsINavHistoryQueryOptions*, int)':
/build/pkgsrc/www/firefox/work/firefox-52.0.2/toolkit/components/places/nsNavHistoryQuery.cpp:1653:22: error: 'setter' cannot be used as a member pointer, since it is of type 'int'
     rv = (aOptions->*setter)(value);
                      ^
/build/pkgsrc/www/firefox/work/firefox-52.0.2/toolkit/components/places/nsNavHistoryQuery.cpp: At global scope:
/build/pkgsrc/www/firefox/work/firefox-52.0.2/toolkit/components/places/nsNavHistoryQuery.cpp:1664:21: error: 'Uint16OptionsSetter' has not been declared
                     Uint16OptionsSetter setter)
                     ^
/build/pkgsrc/www/firefox/work/firefox-52.0.2/toolkit/components/places/nsNavHistoryQuery.cpp: In function 'void SetOptionsKeyUint16(const nsCString&, nsINavHistoryQueryOptions*, int)':
/build/pkgsrc/www/firefox/work/firefox-52.0.2/toolkit/components/places/nsNavHistoryQuery.cpp:1669:22: error: 'setter' cannot be used as a member pointer, since it is of type 'int'
     rv = (aOptions->*setter)(value);
                      ^
/build/pkgsrc/www/firefox/work/firefox-52.0.2/toolkit/components/places/nsNavHistoryQuery.cpp: At global scope:
/build/pkgsrc/www/firefox/work/firefox-52.0.2/toolkit/components/places/nsNavHistoryQuery.cpp:1682:23: error: 'Int64QuerySetter' has not been declared
                       Int64QuerySetter setter)
                       ^
/build/pkgsrc/www/firefox/work/firefox-52.0.2/toolkit/components/places/nsNavHistoryQuery.cpp: In function 'void SetQueryKeyInt64(const nsCString&, nsINavHistoryQuery*, int)':
/build/pkgsrc/www/firefox/work/firefox-52.0.2/toolkit/components/places/nsNavHistoryQuery.cpp:1687:20: error: 'setter' cannot be used as a member pointer, since it is of type 'int'
     rv = (aQuery->*setter)(value);
                    ^
/build/pkgsrc/www/firefox/work/firefox-52.0.2/config/rules.mk:951: recipe for target 'Unified_cpp_components_places0.o' failed


--
IDL