From: kusano <kusano@users.noreply.github.com>
Date: Tue, 16 Feb 2016 16:00:58 +0000 (+0900)
Subject: Merge branch 'master' into fix-mt_rand
X-Git-Tag: php-7.1.0alpha1~617
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=07cae46b02795f8364d28ecad6ec45f507e7114b;p=php

Merge branch 'master' into fix-mt_rand

Conflicts:
	ext/standard/rand.c
---

07cae46b02795f8364d28ecad6ec45f507e7114b
diff --cc ext/standard/rand.c
index 9ec724186b,50729f2418..13b3dcd518
--- 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
   */