- Nuke use of persist_alloc(). This can't be used with a new memory manager

diff --git a/ext/bcmath/bcmath.c b/ext/bcmath/bcmath.c
index c999478da889b81d22d4b7fde4388bf18d07f5ba..8220752e28c7aded4e68afdfb36160fd83bf56c1 100644 (file)
--- a/ext/bcmath/bcmath.c
+++ b/ext/bcmath/bcmath.c
@@ -47,10 +47,10 @@ zend_module_entry bcmath_module_entry = {
        STANDARD_MODULE_HEADER,
        "bcmath",
        bcmath_functions,
-       PHP_MINIT(bcmath),
-       PHP_MSHUTDOWN(bcmath),
-       PHP_RINIT(bcmath),
        NULL,
+       NULL,
+       PHP_RINIT(bcmath),
+       PHP_RSHUTDOWN(bcmath),
        PHP_MINFO(bcmath),
        NO_VERSION_YET,
        STANDARD_MODULE_PROPERTIES
@@ -65,9 +65,9 @@ static long bc_precision;
 #endif
 
 /* Storage used for special numbers. */
-bc_num _zero_;
-bc_num _one_;
-bc_num _two_;
+extern bc_num _zero_;
+extern bc_num _one_;
+extern bc_num _two_;
 
 
 /* Make a copy of a number!  Just increments the reference count! */
@@ -85,34 +85,12 @@ void init_num (bc_num *num)
 }
 
 
-PHP_MINIT_FUNCTION(bcmath)
-{
-       extern bc_num _zero_;
-       extern bc_num _one_;
-       extern bc_num _two_;
-
-       _zero_ = bc_new_num (1, 0);
-       _one_  = bc_new_num (1, 0);
-       _one_->n_value[0] = 1;
-       _two_  = bc_new_num (1, 0);
-       _two_->n_value[0] = 2;
-       persist_alloc(_zero_);
-       persist_alloc(_one_);
-       persist_alloc(_two_);
-       persist_alloc(_zero_->n_ptr);
-       persist_alloc(_one_->n_ptr);
-       persist_alloc(_two_->n_ptr);
-
-       return SUCCESS;
-}
-
-
-
-PHP_MSHUTDOWN_FUNCTION(bcmath)
+PHP_RSHUTDOWN_FUNCTION(bcmath)
 {
        bc_free_num(&_zero_);
        bc_free_num(&_one_);
        bc_free_num(&_two_);
+
        return SUCCESS;
 }
 
@@ -122,6 +100,9 @@ PHP_RINIT_FUNCTION(bcmath)
        if (cfg_get_long("bcmath.scale", &bc_precision)==FAILURE) {
                bc_precision=0;
        }
+       
+       bc_init_numbers();
+       
        return SUCCESS;
 }
 

diff --git a/ext/bcmath/php_bcmath.h b/ext/bcmath/php_bcmath.h
index 8ead3253b883a50aeacc30af368c932e5feb2739..bf57c25e889230a19ece869c6d13c0f5286ed687 100644 (file)
--- a/ext/bcmath/php_bcmath.h
+++ b/ext/bcmath/php_bcmath.h
@@ -26,9 +26,8 @@
 extern zend_module_entry bcmath_module_entry;
 #define phpext_bcmath_ptr &bcmath_module_entry
 
-PHP_MINIT_FUNCTION(bcmath);
-PHP_MSHUTDOWN_FUNCTION(bcmath);
 PHP_RINIT_FUNCTION(bcmath);
+PHP_RSHUTDOWN_FUNCTION(bcmath);
 PHP_MINFO_FUNCTION(bcmath);
 
 PHP_FUNCTION(bcadd);