fix datatype mismatch warnings
fix datatype mismatch warnings
fix datatype mismatch warning
fix warning not all control paths return a value
fix datatype mismatches
fix datatype mismatches
fix ZTS build
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix ZTS build
Merge branch 'PHP-5.6'

* PHP-5.6:
  fix ZTS build