am 4abacac3: Merge "Fix prototype of poll"

* commit '4abacac32dcdc433b83b819ab6e03b958bbfb31c':
  Fix prototype of poll