Merge changes I9347ab44,I3f080b34

* changes:
  use consistent guards for off_t and size_t defines for IA
  Simplify variable typing for IA builds