am 1fa69e47: Merge "Don\'t use errno directly"

* commit '1fa69e4787806be478ca8440468d598209da01e5':
  Don't use errno directly