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

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