mapserver-64: fixes for HEAD build