- run ext sources through conv_proto

- add necessary phpext_*_ptr

3 files changed, 27 insertions, 27 deletions

diff --git a/ext/bcmath/bcmath.c b/ext/bcmath/bcmath.c
index 58073bb679..16dc415f61 100644
--- a/ext/bcmath/bcmath.c
+++ b/ext/bcmath/bcmath.c
@@ -76,7 +76,7 @@ int php3_rend_bcmath(SHUTDOWN_FUNC_ARGS)
 
 /* {{{ proto string bcadd(string left_operand, string right_operand [, int scale])
    Returns the sum of two arbitrary precision numbers */
-void php3_bcmath_add(INTERNAL_FUNCTION_PARAMETERS)
+PHP_FUNCTION(bcmath_add)
 {
 	pval *left, *right,*scale_param;
 	bc_num first, second, result;
@@ -119,7 +119,7 @@ void php3_bcmath_add(INTERNAL_FUNCTION_PARAMETERS)
 
 /* {{{ proto string bcsub(string left_operand, string right_operand [, int scale])
    Returns the difference between two arbitrary precision numbers (subtration) */
-void php3_bcmath_sub(INTERNAL_FUNCTION_PARAMETERS)
+PHP_FUNCTION(bcmath_sub)
 {
 	pval *left, *right,*scale_param;
 	bc_num first, second, result;
@@ -162,7 +162,7 @@ void php3_bcmath_sub(INTERNAL_FUNCTION_PARAMETERS)
 
 /* {{{ proto string bcmul(string left_operand, string right_operand [, int scale])
    Returns the multiplication of two arbitrary precision numbers */
-void php3_bcmath_mul(INTERNAL_FUNCTION_PARAMETERS)
+PHP_FUNCTION(bcmath_mul)
 {
 	pval *left, *right,*scale_param;
 	bc_num first, second, result;
@@ -205,7 +205,7 @@ void php3_bcmath_mul(INTERNAL_FUNCTION_PARAMETERS)
 
 /* {{{ proto string bcdiv(string left_operand, string right_operand [, int scale])
    Returns the quotient of two arbitrary precision numbers (division) */
-void php3_bcmath_div(INTERNAL_FUNCTION_PARAMETERS)
+PHP_FUNCTION(bcmath_div)
 {
 	pval *left, *right,*scale_param;
 	bc_num first, second, result;
@@ -254,7 +254,7 @@ void php3_bcmath_div(INTERNAL_FUNCTION_PARAMETERS)
 
 /* {{{ proto string bcmod(string left_operand, string right_operand)
    Returns the modulus of the two arbitrary precision operands */
-void php3_bcmath_mod(INTERNAL_FUNCTION_PARAMETERS)
+PHP_FUNCTION(bcmath_mod)
 {
 	pval *left, *right;
 	bc_num first, second, result;
@@ -295,7 +295,7 @@ void php3_bcmath_mod(INTERNAL_FUNCTION_PARAMETERS)
 
 /* {{{ proto string bcpow(string x, string y [, int scale])
    Returns the value of an arbitrary precision number raised to the power of another */
-void php3_bcmath_pow(INTERNAL_FUNCTION_PARAMETERS)
+PHP_FUNCTION(bcmath_pow)
 {
 	pval *left, *right,*scale_param;
 	bc_num first, second, result;
@@ -338,7 +338,7 @@ void php3_bcmath_pow(INTERNAL_FUNCTION_PARAMETERS)
 
 /* {{{ proto string bcsqrt(string operand [, int scale])
    Returns the square root of an arbitray precision number */
-void php3_bcmath_sqrt(INTERNAL_FUNCTION_PARAMETERS)
+PHP_FUNCTION(bcmath_sqrt)
 {
 	pval *left,*scale_param;
 	bc_num result;
@@ -378,7 +378,7 @@ void php3_bcmath_sqrt(INTERNAL_FUNCTION_PARAMETERS)
 
 /* {{{ proto string bccomp(string left_operand, string right_operand [, int scale])
    Compares two arbitrary precision numbers */
-void php3_bcmath_comp(INTERNAL_FUNCTION_PARAMETERS)
+PHP_FUNCTION(bcmath_comp)
 {
 	pval *left, *right, *scale_param;
 	bc_num first, second;
@@ -420,7 +420,7 @@ void php3_bcmath_comp(INTERNAL_FUNCTION_PARAMETERS)
 
 /* {{{ proto string bcscale(int scale)
    Sets default scale parameter for all bc math functions */
-void php3_bcmath_set_scale(INTERNAL_FUNCTION_PARAMETERS)
+PHP_FUNCTION(bcmath_set_scale)
 {
 	pval *new_scale;
 	
diff --git a/ext/bcmath/number.h b/ext/bcmath/number.h
index ece47ad768..cbf4762ca4 100644
--- a/ext/bcmath/number.h
+++ b/ext/bcmath/number.h
@@ -99,20 +99,20 @@ typedef bc_struct *bc_num;
 #define FALSE 0
 #endif
 
-extern void init_numbers (void);
-extern void destruct_numbers (void);
-extern void str2num (bc_num *num, char *str, int scale);
+void init_numbers (void);
+void destruct_numbers (void);
+void str2num (bc_num *num, char *str, int scale);
 extern char *num2str (bc_num num);
-extern void bc_add ( bc_num n1, bc_num n2, bc_num *result, int scale_min);
-extern void bc_sub (bc_num n1, bc_num n2, bc_num *result, int scale_min);
-extern void bc_multiply (bc_num n1, bc_num n2, bc_num *prod, int scale);
+void bc_add ( bc_num n1, bc_num n2, bc_num *result, int scale_min);
+void bc_sub (bc_num n1, bc_num n2, bc_num *result, int scale_min);
+void bc_multiply (bc_num n1, bc_num n2, bc_num *prod, int scale);
 extern int bc_divide (bc_num n1, bc_num n2, bc_num *quot, int scale);
 extern int bc_modulo (bc_num num1, bc_num num2, bc_num *result, int scale);
-extern void bc_raise (bc_num num1, bc_num num2, bc_num *result, int scale);
+void bc_raise (bc_num num1, bc_num num2, bc_num *result, int scale);
 extern int bc_sqrt (bc_num *num, int scale);
 extern int bc_compare (bc_num n1, bc_num n2);
 
-extern void free_num (bc_num *num);
-extern void init_num (bc_num *num);
+void free_num (bc_num *num);
+void init_num (bc_num *num);
 
 #endif
diff --git a/ext/bcmath/php3_bcmath.h b/ext/bcmath/php3_bcmath.h
index 8656f83339..062d7fe8fd 100644
--- a/ext/bcmath/php3_bcmath.h
+++ b/ext/bcmath/php3_bcmath.h
@@ -45,15 +45,15 @@ extern php3_module_entry bcmath_module_entry;
 
 extern int php3_rinit_bcmath(INIT_FUNC_ARGS);
 extern int php3_rend_bcmath(SHUTDOWN_FUNC_ARGS);
-extern void php3_bcmath_add(INTERNAL_FUNCTION_PARAMETERS);
-extern void php3_bcmath_sub(INTERNAL_FUNCTION_PARAMETERS);
-extern void php3_bcmath_mul(INTERNAL_FUNCTION_PARAMETERS);
-extern void php3_bcmath_div(INTERNAL_FUNCTION_PARAMETERS);
-extern void php3_bcmath_mod(INTERNAL_FUNCTION_PARAMETERS);
-extern void php3_bcmath_pow(INTERNAL_FUNCTION_PARAMETERS);
-extern void php3_bcmath_sqrt(INTERNAL_FUNCTION_PARAMETERS);
-extern void php3_bcmath_comp(INTERNAL_FUNCTION_PARAMETERS);
-extern void php3_bcmath_set_scale(INTERNAL_FUNCTION_PARAMETERS);
+PHP_FUNCTION(bcmath_add);
+PHP_FUNCTION(bcmath_sub);
+PHP_FUNCTION(bcmath_mul);
+PHP_FUNCTION(bcmath_div);
+PHP_FUNCTION(bcmath_mod);
+PHP_FUNCTION(bcmath_pow);
+PHP_FUNCTION(bcmath_sqrt);
+PHP_FUNCTION(bcmath_comp);
+PHP_FUNCTION(bcmath_set_scale);
 
 #else