From: Nikita Popov <nikic@php.net>
Date: Thu, 11 Jun 2015 20:20:12 +0000 (+0200)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: php-7.0.0alpha2~2^2~164^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=25098f0f5c50249200b1dd80619c782d961287a2;p=php

Merge branch 'PHP-5.6'
---

25098f0f5c50249200b1dd80619c782d961287a2
diff --cc ext/gmp/gmp.c
index 1994052686,575dab8a5b..663bbc96e4
--- a/ext/gmp/gmp.c
+++ b/ext/gmp/gmp.c
@@@ -1837,9 -1841,10 +1837,10 @@@ ZEND_FUNCTION(gmp_random_range
  {
  	zval *min_arg, *max_arg;
  	mpz_ptr gmpnum_min, gmpnum_max, gmpnum_result;
+ 	mpz_t gmpnum_range;
  	gmp_temp_t temp_a, temp_b;
  
 -	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zz", &min_arg, &max_arg) == FAILURE) {
 +	if (zend_parse_parameters(ZEND_NUM_ARGS(), "zz", &min_arg, &max_arg) == FAILURE) {
  		return;
  	}