diff options
author | Anatol Belski <ab@php.net> | 2014-12-18 10:09:02 +0100 |
---|---|---|
committer | Anatol Belski <ab@php.net> | 2014-12-18 10:09:02 +0100 |
commit | 4b943c9c0dd4114adc78416c5241f11ad5c98a80 (patch) | |
tree | c9628d91eae3f580f9ebd73d2372e4c9089b2e00 /ext/bcmath/libbcmath/src/divmod.c | |
parent | 79354ba6d0d6a1a4596f9ac66ee9bc3a34ed972b (diff) | |
parent | dec8eb431adee340fb8dfb9ff33ed29d3279c35f (diff) | |
download | php-git-POST_NATIVE_TLS_MERGE.tar.gz |
Merge remote-tracking branch 'origin/native-tls'POST_NATIVE_TLS_MERGE
Diffstat (limited to 'ext/bcmath/libbcmath/src/divmod.c')
-rw-r--r-- | ext/bcmath/libbcmath/src/divmod.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/ext/bcmath/libbcmath/src/divmod.c b/ext/bcmath/libbcmath/src/divmod.c index 2949bd10d4..09d43756c2 100644 --- a/ext/bcmath/libbcmath/src/divmod.c +++ b/ext/bcmath/libbcmath/src/divmod.c @@ -45,24 +45,24 @@ */ int -bc_divmod (bc_num num1, bc_num num2, bc_num *quot, bc_num *rem, int scale TSRMLS_DC) +bc_divmod (bc_num num1, bc_num num2, bc_num *quot, bc_num *rem, int scale) { bc_num quotient = NULL; bc_num temp; int rscale; /* Check for correct numbers. */ - if (bc_is_zero (num2 TSRMLS_CC)) return -1; + if (bc_is_zero (num2)) return -1; /* Calculate final scale. */ rscale = MAX (num1->n_scale, num2->n_scale+scale); - bc_init_num(&temp TSRMLS_CC); + bc_init_num(&temp); /* Calculate it. */ - bc_divide (num1, num2, &temp, scale TSRMLS_CC); + bc_divide (num1, num2, &temp, scale); if (quot) quotient = bc_copy_num (temp); - bc_multiply (temp, num2, &temp, rscale TSRMLS_CC); + bc_multiply (temp, num2, &temp, rscale); bc_sub (num1, temp, rem, rscale); bc_free_num (&temp); @@ -80,8 +80,8 @@ bc_divmod (bc_num num1, bc_num num2, bc_num *quot, bc_num *rem, int scale TSRMLS result in RESULT. */ int -bc_modulo (bc_num num1, bc_num num2, bc_num *result, int scale TSRMLS_DC) +bc_modulo (bc_num num1, bc_num num2, bc_num *result, int scale) { - return bc_divmod (num1, num2, NULL, result, scale TSRMLS_CC); + return bc_divmod (num1, num2, NULL, result, scale); } |