diff options
| author | Anatol Belski <ab@php.net> | 2014-08-16 17:31:40 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-08-16 17:31:40 +0200 |
| commit | 864172d9a49a6201513d83c06b77b5d309dc50ab (patch) | |
| tree | 6aa4b3249a59aa8f3b21a06cb28a1fc2f0f5dae6 /ext/standard/php_rand.h | |
| parent | 54906c760fb578079b6783a2aa4184372a3179d3 (diff) | |
| download | php-git-864172d9a49a6201513d83c06b77b5d309dc50ab.tar.gz | |
further fixes to ext/standard and zend
Diffstat (limited to 'ext/standard/php_rand.h')
| -rw-r--r-- | ext/standard/php_rand.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ext/standard/php_rand.h b/ext/standard/php_rand.h index 0e8abb3613..dd41c57d88 100644 --- a/ext/standard/php_rand.h +++ b/ext/standard/php_rand.h @@ -42,19 +42,19 @@ #endif #define RAND_RANGE(__n, __min, __max, __tmax) \ - (__n) = (__min) + (long) ((double) ( (double) (__max) - (__min) + 1.0) * ((__n) / ((__tmax) + 1.0))) + (__n) = (__min) + (php_int_t) ((double) ( (double) (__max) - (__min) + 1.0) * ((__n) / ((__tmax) + 1.0))) /* MT Rand */ -#define PHP_MT_RAND_MAX ((long) (0x7FFFFFFF)) /* (1<<31) - 1 */ +#define PHP_MT_RAND_MAX ((php_int_t) (0x7FFFFFFF)) /* (1<<31) - 1 */ #ifdef PHP_WIN32 -#define GENERATE_SEED() (((long) (time(0) * GetCurrentProcessId())) ^ ((long) (1000000.0 * php_combined_lcg(TSRMLS_C)))) +#define GENERATE_SEED() (((php_int_t) (time(0) * GetCurrentProcessId())) ^ ((php_int_t) (1000000.0 * php_combined_lcg(TSRMLS_C)))) #else -#define GENERATE_SEED() (((long) (time(0) * getpid())) ^ ((long) (1000000.0 * php_combined_lcg(TSRMLS_C)))) +#define GENERATE_SEED() (((php_int_t) (time(0) * getpid())) ^ ((php_int_t) (1000000.0 * php_combined_lcg(TSRMLS_C)))) #endif -PHPAPI void php_srand(long seed TSRMLS_DC); -PHPAPI long php_rand(TSRMLS_D); +PHPAPI void php_srand(php_int_t seed TSRMLS_DC); +PHPAPI php_int_t php_rand(TSRMLS_D); PHPAPI void php_mt_srand(php_uint32 seed TSRMLS_DC); PHPAPI php_uint32 php_mt_rand(TSRMLS_D); |