Changed bc_divide to bc_divide_ex, and changed three division functions to use it.

Author: SakiTakamachi

ext/bcmath/config.m4

@@ -10,7 +10,6 @@ if test "$PHP_BCMATH" != "no"; then
       libbcmath/src/compare.c
       libbcmath/src/convert.c
       libbcmath/src/div.c
-      libbcmath/src/divmod.c
       libbcmath/src/doaddsub.c
       libbcmath/src/floor_or_ceil.c
       libbcmath/src/long2num.c

ext/bcmath/config.w32

@@ -5,7 +5,7 @@ ARG_ENABLE("bcmath", "bc style precision math functions", "yes");
 if (PHP_BCMATH == "yes") {
 	EXTENSION("bcmath", "bcmath.c",	null, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1");
 	ADD_SOURCES("ext/bcmath/libbcmath/src", "add.c div.c init.c neg.c \
-		raisemod.c sub.c compare.c divmod.c int2num.c long2num.c \
+		raisemod.c sub.c compare.c int2num.c long2num.c \
 		num2long.c recmul.c sqrt.c zero.c doaddsub.c \
 		floor_or_ceil.c nearzero.c num2str.c raise.c rmzero.c str2num.c \
 		round.c convert.c", "bcmath");

ext/bcmath/libbcmath/src/bcmath.h

@@ -147,11 +147,9 @@ bc_num bc_multiply(bc_num n1, bc_num n2, size_t scale);
 	*(result) = mul_ex;                             \
 } while (0)
 
-bool bc_divide(bc_num n1, bc_num n2, bc_num *quot, size_t scale);
+bc_num bc_square(bc_num n1, size_t scale);
 
-bool bc_modulo(bc_num num1, bc_num num2, bc_num *resul, size_t scale);
-
-bool bc_divmod(bc_num num1, bc_num num2, bc_num *quo, bc_num *rem, size_t scale);
+bool bc_divide_ex(bc_num numerator, bc_num divisor, bc_num *quot, bc_num *rem, size_t scale, bool use_quot, bool use_rem);
 
 bc_num bc_floor_or_ceil(bc_num num, bool is_floor);
 
@@ -188,4 +186,9 @@ bool bc_sqrt(bc_num *num, size_t scale);
 #define bc_free_num(num)					_bc_free_num_ex((num), 0)
 #define bc_num2str(num)						bc_num2str_ex((num), (num->n_scale))
 
+/* div and mod */
+#define bc_divide(n1, n2, quot, scale)		bc_divide_ex((n1), (n2), (quot), NULL, (scale), true, false)
+#define bc_modulo(n1, n2, rem, scale) 		bc_divide_ex((n1), (n2), NULL, (rem), (scale), false, true)
+#define bc_divmod(n1, n2, quot, rem, scale)	bc_divide_ex((n1), (n2), (quot), (rem), (scale), true, true)
+
 #endif

ext/bcmath/libbcmath/src/div.c

@@ -338,7 +338,7 @@ static inline void bc_divide_by_pow_10(
 	}
 }
 
-bool bc_divide(bc_num numerator, bc_num divisor, bc_num *quot, size_t scale)
+bool bc_divide_ex(bc_num numerator, bc_num divisor, bc_num *quot, bc_num *rem, size_t scale, bool use_quot, bool use_rem)
 {
 	/* divide by zero */
 	if (bc_is_zero(divisor)) {