dsp Fri, 27 Nov 2009 22:24:44 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=291362
Log: Use extended base if we build again gmp 4.2.0 which is usually available. Changed paths: U php/php-src/branches/PHP_5_3/ext/gmp/gmp.c U php/php-src/trunk/ext/gmp/gmp.c Modified: php/php-src/branches/PHP_5_3/ext/gmp/gmp.c =================================================================== --- php/php-src/branches/PHP_5_3/ext/gmp/gmp.c 2009-11-27 21:39:23 UTC (rev 291361) +++ php/php-src/branches/PHP_5_3/ext/gmp/gmp.c 2009-11-27 22:24:44 UTC (rev 291362) @@ -746,7 +746,11 @@ return; } +#if __GNU_MP_VERSION >= 4 && __GNU_MP_VERSION_MINOR >= 2 if (base && (base < 2 || base > 62)) { +#else + if (base && (base < 2 || base > 36)) { +#endif php_error_docref(NULL TSRMLS_CC, E_WARNING, "Bad base for conversion: %ld (should be between 2 and 36)", base); RETURN_FALSE; } @@ -796,7 +800,11 @@ return; } +#if __GNU_MP_VERSION >= 4 && __GNU_MP_VERSION_MINOR >= 2 if ((base < 2 && base > -2) || base > 62 || base < -36) { +#else + if (base < 2 || base > 36) { +#endif php_error_docref(NULL TSRMLS_CC, E_WARNING, "Bad base for conversion: %ld", base); RETURN_FALSE; } Modified: php/php-src/trunk/ext/gmp/gmp.c =================================================================== --- php/php-src/trunk/ext/gmp/gmp.c 2009-11-27 21:39:23 UTC (rev 291361) +++ php/php-src/trunk/ext/gmp/gmp.c 2009-11-27 22:24:44 UTC (rev 291362) @@ -754,7 +754,11 @@ return; } +#if __GNU_MP_VERSION >= 4 && __GNU_MP_VERSION_MINOR >= 2 if (base && (base < 2 || base > 62)) { +#else + if (base && (base < 2 || base > 36)) { +#endif php_error_docref(NULL TSRMLS_CC, E_WARNING, "Bad base for conversion: %ld (should be between 2 and 36)", base); RETURN_FALSE; } @@ -804,7 +808,11 @@ return; } +#if __GNU_MP_VERSION >= 4 && __GNU_MP_VERSION_MINOR >= 2 if ((base < 2 && base > -2) || base > 62 || base < -36) { +#else + if (base < 2 || base > 36) { +#endif php_error_docref(NULL TSRMLS_CC, E_WARNING, "Bad base for conversion: %ld", base); RETURN_FALSE; }
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php