am d559d6c7: Merge "defined(HAVE_OFF_T) is really just !defined(__APPLE__)."

* commit 'd559d6c72a411d14c7a964dad1eb7f6e229314cb':
  defined(HAVE_OFF_T) is really just !defined(__APPLE__).