am 7989d226: (-s ours) Fix 64 bit build

* commit '7989d22642415e1e4d608e210284834951bd0a39':
  Fix 64 bit build