avoid clash when stdint.h was included after win32/php_stdint.h
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  avoid clash when stdint.h was included after win32/php_stdint.h
Merge branch 'PHP-5.6'

* PHP-5.6:
  avoid clash when stdint.h was included after win32/php_stdint.h