There was a minor conflict in planmain.h. Here's a refreshed version.
-- Álvaro Herrera https://www.2ndQuadrant.com/PostgreSQL Development, 24x7 Support, Remote DBA, Training & Services