Hi,

Please find attached a patch that removes calls to obsolete macros.

Kind regards,
-- 
           Peter