Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fixed build
  NEWS for bug #63893

Conflicts:
	NEWS
This commit is contained in:
Anatoliy Belsky 2013-01-15 22:39:49 +01:00
commit 18e160411e

View File

@ -23,7 +23,11 @@
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
#include <stdio.h>
#include <stdint.h>
#ifdef PHP_WIN32
# include "win32/php_stdint.h"
#else
# include <stdint.h>
#endif
#include "php.h"
#include "php_rand.h"
#include "php_string.h"