com php-src: Merge branch 'master' into fix-mt_rand: ext/ standard/rand.c
| From: | Xinchen Hui | Date: | Tue, 16 Feb 2016 16:00:58 +0000 |
| Subject: | com php-src: Merge branch 'master' into fix-mt_rand: ext/ standard/rand.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-91072@lists.php.net to get a copy of this message | ||
Commit: 07cae46b02795f8364d28ecad6ec45f507e7114b
Author: kusano <kusano@users.noreply.github.com> Wed, 17 Feb 2016 01:00:58 +0900
Parents: d31e8a9a85efea54db0b647424f6c4485d71db8b 3244d3c7e936b23ad33892e367500f64468c6140
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=07cae46b02795f8364d28ecad6ec45f507e7114b
Log:
Merge branch 'master' into fix-mt_rand
Conflicts:
ext/standard/rand.c
Changed paths:
MM ext/standard/rand.c
Diff:
diff --cc ext/standard/rand.c
index 9ec7241,50729f2..13b3dcd
--- a/ext/standard/rand.c
+++ b/ext/standard/rand.c
@@@ -146,7 -146,7 +146,7 @@@ 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(v))) &
0x9908b0dfU))
-#define twist(m,u,v) (m ^ (mixBits(u,v)>>1) ^ ((uint32_t)(-(int32_t)(loBit(u))) &
0x9908b0dfU))
++#define twist(m,u,v) (m ^ (mixBits(u,v)>>1) ^ ((uint32_t)(-(int32_t)(loBit(v))) &
0x9908b0dfU))
/* {{{ php_mt_initialize
*/