diff options
| author | Rouven Weßling <rouven@contentful.com> | 2016-01-28 17:11:53 +0100 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2016-02-04 11:57:41 +0100 |
| commit | a61029b15554d1a5da81a6e6d498f02629bf4242 (patch) | |
| tree | 36159f58938cc549879b313f8fd347f9c6087df0 /ext/standard/rand.c | |
| parent | d998ca6e3cedfd663a1a40a36b814d05b5df6e71 (diff) | |
| download | php-git-a61029b15554d1a5da81a6e6d498f02629bf4242.tar.gz | |
Replace usage of php_int32 and php_uint32 with int32_t and uint32_t
Diffstat (limited to 'ext/standard/rand.c')
| -rw-r--r-- | ext/standard/rand.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/ext/standard/rand.c b/ext/standard/rand.c index 2dd05e70bb..50729f2418 100644 --- a/ext/standard/rand.c +++ b/ext/standard/rand.c @@ -146,19 +146,19 @@ PHPAPI zend_long php_rand(void) #define loBits(u) ((u) & 0x7FFFFFFFU) /* mask the highest bit of u */ #define mixBits(u, v) (hiBit(u)|loBits(v)) /* move hi bit of u to hi bit of v */ -#define twist(m,u,v) (m ^ (mixBits(u,v)>>1) ^ ((php_uint32)(-(php_int32)(loBit(u))) & 0x9908b0dfU)) +#define twist(m,u,v) (m ^ (mixBits(u,v)>>1) ^ ((uint32_t)(-(int32_t)(loBit(u))) & 0x9908b0dfU)) /* {{{ php_mt_initialize */ -static inline void php_mt_initialize(php_uint32 seed, php_uint32 *state) +static inline void php_mt_initialize(uint32_t seed, uint32_t *state) { /* Initialize generator state with seed See Knuth TAOCP Vol 2, 3rd Ed, p.106 for multiplier. In previous versions, most significant bits (MSBs) of the seed affect only MSBs of the state array. Modified 9 Jan 2002 by Makoto Matsumoto. */ - register php_uint32 *s = state; - register php_uint32 *r = state; + register uint32_t *s = state; + register uint32_t *r = state; register int i = 1; *s++ = seed & 0xffffffffU; @@ -176,8 +176,8 @@ static inline void php_mt_reload(void) /* Generate N new values in state Made clearer and faster by Matthew Bellew (matthew.bellew@home.com) */ - register php_uint32 *state = BG(state); - register php_uint32 *p = state; + register uint32_t *state = BG(state); + register uint32_t *p = state; register int i; for (i = N - M; i--; ++p) @@ -192,7 +192,7 @@ static inline void php_mt_reload(void) /* {{{ php_mt_srand */ -PHPAPI void php_mt_srand(php_uint32 seed) +PHPAPI void php_mt_srand(uint32_t seed) { /* Seed the generator with a simple uint32 */ php_mt_initialize(seed, BG(state)); @@ -205,12 +205,12 @@ PHPAPI void php_mt_srand(php_uint32 seed) /* {{{ php_mt_rand */ -PHPAPI php_uint32 php_mt_rand(void) +PHPAPI uint32_t php_mt_rand(void) { /* Pull a 32-bit integer from the generator state Every other access function simply transforms the numbers extracted here */ - register php_uint32 s1; + register uint32_t s1; if (BG(left) == 0) { php_mt_reload(); |