[Git][pacman/pacman][master] 2 commits: Fix compile on some platforms