From: Pierre Joye <pajoye@php.net>
Date: Thu, 10 Dec 2009 02:25:47 +0000 (+0000)
Subject: - [DOC] expose MPIR version when mpir is used instead of gmp
X-Git-Tag: php-5.4.0alpha1~191^2~2254
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=272974078b5583ae28217f88b1c70c4689417578;p=php

- [DOC] expose MPIR version when mpir is used instead of gmp
---

diff --git a/ext/gmp/config.w32 b/ext/gmp/config.w32
index fdaa606af0..8c863f9bc8 100644
--- a/ext/gmp/config.w32
+++ b/ext/gmp/config.w32
@@ -8,6 +8,7 @@ if (PHP_GMP != "no") {
 		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");
 	}
diff --git a/ext/gmp/gmp.c b/ext/gmp/gmp.c
index 6b2843b173..1bd68987f3 100644
--- a/ext/gmp/gmp.c
+++ b/ext/gmp/gmp.c
@@ -356,6 +356,9 @@ ZEND_MODULE_STARTUP_D(gmp)
 	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 @@ ZEND_MODULE_INFO_D(gmp)
 {
 	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();
 }
 /* }}} */