Merge branch 'dd/poll-dot-h'

A build update.

* dd/poll-dot-h:
  git-compat-util: prefer poll.h to sys/poll.h

diff --cc Makefile
Simple merge

diff --cc configure.ac
Simple merge