mirror of
https://github.com/php/php-src.git
synced 2024-12-11 19:04:38 +08:00
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:
commit
18e160411e
@ -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"
|
||||
|
Loading…
Reference in New Issue
Block a user