diff options
| author | Stanislav Malyshev <stas@php.net> | 2014-04-20 16:36:36 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2014-04-20 16:36:36 -0700 |
| commit | 5272d6c896b955d85a527f5a83da3ec8b434bb5a (patch) | |
| tree | 3a26b70c710eddcbc0f5a0da11f70362f80f8923 | |
| parent | 0df431482fba37a3dac433d52cf339f55e81f817 (diff) | |
| parent | 8b903f24d5c2df07fe007c8c9bd48283813c8e21 (diff) | |
| download | php-git-5272d6c896b955d85a527f5a83da3ec8b434bb5a.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fix a compiler warning in php_rand.h
| -rw-r--r-- | ext/standard/php_rand.h | 1 | ||||
| -rw-r--r-- | ext/standard/rand.c | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/ext/standard/php_rand.h b/ext/standard/php_rand.h index 2928d98c5e..0e8abb3613 100644 --- a/ext/standard/php_rand.h +++ b/ext/standard/php_rand.h @@ -27,6 +27,7 @@ #include <stdlib.h> #include "basic_functions.h" +#include "php_lcg.h" /* System Rand functions */ #ifndef RAND_MAX diff --git a/ext/standard/rand.c b/ext/standard/rand.c index b0af30aa9d..702fec2311 100644 --- a/ext/standard/rand.c +++ b/ext/standard/rand.c @@ -30,7 +30,6 @@ #include "php.h" #include "php_math.h" #include "php_rand.h" -#include "php_lcg.h" #include "basic_functions.h" |