[PHP-CVS] com php-src: Support gmp_remroot() on GMP 4.1: ext/gmp/gmp.c

2013-12-03 Thread Nikita Popov 
Commit:00c74ccf69ff5f4765c7a66bcf320bfad0cbbad5
Author:Nikita Popov ni...@php.net Mon, 2 Dec 2013 20:10:08 +0100
Parents:   2d230254de72ccbdecf4119160cd376e37e5692f
Branches:  PHP-5.6 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=00c74ccf69ff5f4765c7a66bcf320bfad0cbbad5

Log:
Support gmp_remroot() on GMP 4.1

Changed paths:
  M  ext/gmp/gmp.c


Diff:
diff --git a/ext/gmp/gmp.c b/ext/gmp/gmp.c
index f243b31..8835f05 100644
--- a/ext/gmp/gmp.c
+++ b/ext/gmp/gmp.c
@@ -204,9 +204,12 @@ typedef struct _gmp_temp {
 #define GMP_ROUND_PLUSINF   1
 #define GMP_ROUND_MINUSINF  2
 
+#define GMP_42_OR_NEWER \
+   ((__GNU_MP_VERSION = 5) || (__GNU_MP_VERSION = 4  
__GNU_MP_VERSION_MINOR = 2))
+
 /* The maximum base for input and output conversions is 62 from GMP 4.2
  * onwards. */
-#if (__GNU_MP_VERSION = 5) || (__GNU_MP_VERSION = 4  
__GNU_MP_VERSION_MINOR = 2)
+#if GMP_42_OR_NEWER
 #  define MAX_BASE 62
 #else
 #  define MAX_BASE 36
@@ -1455,7 +1458,15 @@ ZEND_FUNCTION(gmp_rootrem)
add_index_zval(return_value, 0, gmp_create(gmpnum_result1 TSRMLS_CC));
add_index_zval(return_value, 1, gmp_create(gmpnum_result2 TSRMLS_CC));
 
+#if GMP_42_OR_NEWER
mpz_rootrem(gmpnum_result1, gmpnum_result2, gmpnum_a, (unsigned long) 
nth);
+#else
+   mpz_root(gmpnum_result1, gmpnum_a, (unsigned long) nth);
+   mpz_pow_ui(gmpnum_result2, gmpnum_result1, (unsigned long) nth);
+   mpz_sub(gmpnum_result2, gmpnum_a, gmpnum_result2);
+   mpz_abs(gmpnum_result2, gmpnum_result2);
+#endif
+   
FREE_GMP_TEMP(temp_a);
 }
 /* }}} */


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] com php-src: Support gmp_remroot() on GMP 4.1: ext/gmp/gmp.c

2013-12-03 Thread Anatol Belski 
Commit:b3265e210805a6140cc49d6db712b77127163e5b
Author:Nikita Popov ni...@php.net Mon, 2 Dec 2013 20:10:08 +0100
Committer: Anatol Belski a...@php.net  Tue, 3 Dec 2013 10:19:10 +0100
Parents:   e23b051be0fe19e338a71eecc0df44afdc44a84e
Branches:  str_size_and_int64

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=b3265e210805a6140cc49d6db712b77127163e5b

Log:
Support gmp_remroot() on GMP 4.1

Changed paths:
  M  ext/gmp/gmp.c


Diff:
diff --git a/ext/gmp/gmp.c b/ext/gmp/gmp.c
index aea010b..c49402d 100644
--- a/ext/gmp/gmp.c
+++ b/ext/gmp/gmp.c
@@ -204,9 +204,12 @@ typedef struct _gmp_temp {
 #define GMP_ROUND_PLUSINF   1
 #define GMP_ROUND_MINUSINF  2
 
+#define GMP_42_OR_NEWER \
+   ((__GNU_MP_VERSION = 5) || (__GNU_MP_VERSION = 4  
__GNU_MP_VERSION_MINOR = 2))
+
 /* The maximum base for input and output conversions is 62 from GMP 4.2
  * onwards. */
-#if (__GNU_MP_VERSION = 5) || (__GNU_MP_VERSION = 4  
__GNU_MP_VERSION_MINOR = 2)
+#if GMP_42_OR_NEWER
 #  define MAX_BASE 62
 #else
 #  define MAX_BASE 36
@@ -1455,7 +1458,15 @@ ZEND_FUNCTION(gmp_rootrem)
add_index_zval(return_value, 0, gmp_create(gmpnum_result1 TSRMLS_CC));
add_index_zval(return_value, 1, gmp_create(gmpnum_result2 TSRMLS_CC));
 
+#if GMP_42_OR_NEWER
mpz_rootrem(gmpnum_result1, gmpnum_result2, gmpnum_a, (unsigned long) 
nth);
+#else
+   mpz_root(gmpnum_result1, gmpnum_a, (unsigned long) nth);
+   mpz_pow_ui(gmpnum_result2, gmpnum_result1, (unsigned long) nth);
+   mpz_sub(gmpnum_result2, gmpnum_a, gmpnum_result2);
+   mpz_abs(gmpnum_result2, gmpnum_result2);
+#endif
+   
FREE_GMP_TEMP(temp_a);
 }
 /* }}} */


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php