Merge branch 'PHP-5.5' into PHP-5.6

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

Author: weltling

win32/php_stdint.h

@@ -36,6 +36,10 @@
 #ifndef _MSC_STDINT_H_ // [
 #define _MSC_STDINT_H_
 
+#ifndef _STDINT
+# define _STDINT
+#endif
+
 #if _MSC_VER > 1000
 #pragma once
 #endif