php: fix gmp extension build after libgmp bump
authorPeter Korsgaard <jacmet@sunsite.dk>
Tue, 28 Dec 2010 07:52:14 +0000 (08:52 +0100)
committerPeter Korsgaard <jacmet@sunsite.dk>
Tue, 28 Dec 2010 07:52:14 +0000 (08:52 +0100)
Patch from php svn r295402.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
package/php/php-5.2.16-fix-build-when-__GMP_BITS_PER_MP_LIMB-is-not-defined.patch [new file with mode: 0644]

diff --git a/package/php/php-5.2.16-fix-build-when-__GMP_BITS_PER_MP_LIMB-is-not-defined.patch b/package/php/php-5.2.16-fix-build-when-__GMP_BITS_PER_MP_LIMB-is-not-defined.patch
new file mode 100644 (file)
index 0000000..221b3c0
--- /dev/null
@@ -0,0 +1,30 @@
+From e814fcac0599dbaae50ede1f9f78e20941e27877 Mon Sep 17 00:00:00 2001
+From: pajoye <pajoye@c90b9560-bf6c-de11-be94-00142212c4b1>
+Date: Tue, 23 Feb 2010 11:07:39 +0000
+Subject: [PATCH] - fix build when __GMP_BITS_PER_MP_LIMB is not defined but GMP_LIMB_BITS (no trace of this change in gmp's changelog...)
+
+git-svn-id: http://svn.php.net/repository/php/php-src/branches/PHP_5_3@295402 c90b9560-bf6c-de11-be94-00142212c4b1
+---
+ ext/gmp/gmp.c |    5 ++++-
+ 1 files changed, 4 insertions(+), 1 deletions(-)
+
+diff --git a/ext/gmp/gmp.c b/ext/gmp/gmp.c
+index a54ffe9..f53dcd6 100644
+--- a/ext/gmp/gmp.c
++++ b/ext/gmp/gmp.c
+@@ -1374,8 +1374,11 @@ ZEND_FUNCTION(gmp_random)
+               GMPG(rand_initialized) = 1;
+       }
++#ifdef GMP_LIMB_BITS
++      mpz_urandomb(*gmpnum_result, GMPG(rand_state), GMP_ABS (limiter) * GMP_LIMB_BITS);
++#else
+       mpz_urandomb(*gmpnum_result, GMPG(rand_state), GMP_ABS (limiter) * __GMP_BITS_PER_MP_LIMB);
+-
++#endif
+       ZEND_REGISTER_RESOURCE(return_value, gmpnum_result, le_gmp);
+ }
+ /* }}} */
+-- 
+1.7.1
+