pajoye Thu, 10 Dec 2009 02:25:47 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=291937
Log:
- [DOC] expose MPIR version when mpir is used instead of gmp
Changed paths:
U php/php-src/branches/PHP_5_3/ext/gmp/config.w32
U php/php-src/branches/PHP_5_3/ext/gmp/gmp.c
U php/php-src/trunk/ext/gmp/config.w32
U php/php-src/trunk/ext/gmp/gmp.c
Modified: php/php-src/branches/PHP_5_3/ext/gmp/config.w32
===================================================================
--- php/php-src/branches/PHP_5_3/ext/gmp/config.w32 2009-12-09 22:46:12 UTC
(rev 291936)
+++ php/php-src/branches/PHP_5_3/ext/gmp/config.w32 2009-12-10 02:25:47 UTC
(rev 291937)
@@ -8,6 +8,7 @@
CHECK_HEADER_ADD_INCLUDE("gmp.h", "CFLAGS_GMP", PHP_GMP + ";"
+ PHP_PHP_BUILD + "\\include\\mpir")) {
EXTENSION("gmp", "gmp.c");
AC_DEFINE('HAVE_GMP', 1, 'GMP support');
+ AC_DEFINE('HAVE_MPIR', 1, 'MPIR support');
} else {
WARNING("GMP not enabled; libraries and headers not found");
}
Modified: php/php-src/branches/PHP_5_3/ext/gmp/gmp.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/gmp/gmp.c 2009-12-09 22:46:12 UTC (rev
291936)
+++ php/php-src/branches/PHP_5_3/ext/gmp/gmp.c 2009-12-10 02:25:47 UTC (rev
291937)
@@ -356,6 +356,9 @@
REGISTER_LONG_CONSTANT("GMP_ROUND_ZERO", GMP_ROUND_ZERO, CONST_CS |
CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("GMP_ROUND_PLUSINF", GMP_ROUND_PLUSINF, CONST_CS
| CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("GMP_ROUND_MINUSINF", GMP_ROUND_MINUSINF,
CONST_CS | CONST_PERSISTENT);
+#ifdef mpir_version
+ REGISTER_STRING_CONSTANT("GMP_MPIR_VERSION", (char *)mpir_version,
CONST_CS | CONST_PERSISTENT);
+#endif
REGISTER_STRING_CONSTANT("GMP_VERSION", (char *)gmp_version, CONST_CS |
CONST_PERSISTENT);
mp_set_memory_functions(gmp_emalloc, gmp_erealloc, gmp_efree);
@@ -383,7 +386,11 @@
{
php_info_print_table_start();
php_info_print_table_row(2, "gmp support", "enabled");
+#ifdef mpir_version
+ php_info_print_table_row(2, "MPIR version", mpir_version);
+#else
php_info_print_table_row(2, "GMP version", gmp_version);
+#endif
php_info_print_table_end();
}
/* }}} */
@@ -746,7 +753,7 @@
return;
}
-#if __GNU_MP_VERSION >= 4 && __GNU_MP_VERSION_MINOR >= 2
+#if (__GNU_MP_VERSION >= 4 && __GNU_MP_VERSION_MINOR >= 2)
if (base && (base < 2 || base > 62)) {
#else
if (base && (base < 2 || base > 36)) {
Modified: php/php-src/trunk/ext/gmp/config.w32
===================================================================
--- php/php-src/trunk/ext/gmp/config.w32 2009-12-09 22:46:12 UTC (rev
291936)
+++ php/php-src/trunk/ext/gmp/config.w32 2009-12-10 02:25:47 UTC (rev
291937)
@@ -8,6 +8,7 @@
CHECK_HEADER_ADD_INCLUDE("gmp.h", "CFLAGS_GMP", PHP_GMP + ";"
+ PHP_PHP_BUILD + "\\include\\mpir")) {
EXTENSION("gmp", "gmp.c");
AC_DEFINE('HAVE_GMP', 1, 'GMP support');
+ AC_DEFINE('HAVE_MPIR', 1, 'MPIR support');
} else {
WARNING("GMP not enabled; libraries and headers not found");
}
Modified: php/php-src/trunk/ext/gmp/gmp.c
===================================================================
--- php/php-src/trunk/ext/gmp/gmp.c 2009-12-09 22:46:12 UTC (rev 291936)
+++ php/php-src/trunk/ext/gmp/gmp.c 2009-12-10 02:25:47 UTC (rev 291937)
@@ -356,6 +356,9 @@
REGISTER_LONG_CONSTANT("GMP_ROUND_ZERO", GMP_ROUND_ZERO, CONST_CS |
CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("GMP_ROUND_PLUSINF", GMP_ROUND_PLUSINF, CONST_CS
| CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("GMP_ROUND_MINUSINF", GMP_ROUND_MINUSINF,
CONST_CS | CONST_PERSISTENT);
+#ifdef mpir_version
+ REGISTER_STRING_CONSTANT("GMP_MPIR_VERSION", (char *)mpir_version,
CONST_CS | CONST_PERSISTENT);
+#endif
REGISTER_STRING_CONSTANT("GMP_VERSION", (char *)gmp_version, CONST_CS |
CONST_PERSISTENT);
mp_set_memory_functions(gmp_emalloc, gmp_erealloc, gmp_efree);
@@ -383,7 +386,11 @@
{
php_info_print_table_start();
php_info_print_table_row(2, "gmp support", "enabled");
+#ifdef mpir_version
+ php_info_print_table_row(2, "MPIR version", mpir_version);
+#else
php_info_print_table_row(2, "GMP version", gmp_version);
+#endif
php_info_print_table_end();
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
