China’s Xi, France’s Macron discuss Gaza war, press on 2-state solution