mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-04 22:20:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merge 3.3.

Browse source
This commit is contained in:
Stefan Krah 2012-12-21 23:23:25 +01:00
commit f31b603558
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Modules/_decimal/_decimal.c
View file

@ -3484,7 +3484,7 @@ PyDec_Round(PyObject *dec, PyObject *args)
} }
} }
PyObject *DecimalTuple = NULL; static PyObject *DecimalTuple = NULL;
/* Return the DecimalTuple representation of a PyDecObject. */ /* Return the DecimalTuple representation of a PyDecObject. */
static PyObject * static PyObject *
PyDec_AsTuple(PyObject *dec, PyObject *dummy UNUSED) PyDec_AsTuple(PyObject *dec, PyObject *dummy UNUSED)

14
Modules/_decimal/libmpdec/mpdecimal.c
View file

@ -107,7 +107,7 @@ static inline void _mpd_qpow_uint(mpd_t *result, const mpd_t *base,
mpd_uint_t exp, uint8_t resultsign, mpd_uint_t exp, uint8_t resultsign,
const mpd_context_t *ctx, uint32_t *status); const mpd_context_t *ctx, uint32_t *status);
mpd_uint_t mpd_qsshiftr(mpd_t *result, const mpd_t *a, mpd_ssize_t n); static mpd_uint_t mpd_qsshiftr(mpd_t *result, const mpd_t *a, mpd_ssize_t n);
/******************************************************************************/ /******************************************************************************/
@ -2301,7 +2301,7 @@ _mpd_get_rnd(const mpd_uint_t *data, mpd_ssize_t len, int use_msd)
* It is the caller's responsibility to ensure that the coefficient is big * It is the caller's responsibility to ensure that the coefficient is big
* enough. The function cannot fail. * enough. The function cannot fail.
*/ */
mpd_uint_t static mpd_uint_t
mpd_qsshiftr(mpd_t *result, const mpd_t *a, mpd_ssize_t n) mpd_qsshiftr(mpd_t *result, const mpd_t *a, mpd_ssize_t n)
{ {
mpd_uint_t rnd; mpd_uint_t rnd;
@ -5123,7 +5123,7 @@ _karatsuba_rec(mpd_uint_t *c, const mpd_uint_t *a, const mpd_uint_t *b,
* to the result or NULL in case of failure (malloc error). * to the result or NULL in case of failure (malloc error).
* Conditions: ulen >= vlen, ulen >= 4 * Conditions: ulen >= vlen, ulen >= 4
*/ */
mpd_uint_t * static mpd_uint_t *
_mpd_kmul(const mpd_uint_t *u, const mpd_uint_t *v, _mpd_kmul(const mpd_uint_t *u, const mpd_uint_t *v,
mpd_size_t ulen, mpd_size_t vlen, mpd_size_t ulen, mpd_size_t vlen,
mpd_size_t *rsize) mpd_size_t *rsize)
@ -5208,7 +5208,7 @@ _mpd_set_control87(unsigned short cw)
} }
#endif #endif
unsigned int static unsigned int
mpd_set_fenv(void) mpd_set_fenv(void)
{ {
unsigned int cw; unsigned int cw;
@ -5228,7 +5228,7 @@ mpd_set_fenv(void)
return cw; return cw;
} }
void static void
mpd_restore_fenv(unsigned int cw) mpd_restore_fenv(unsigned int cw)
{ {
#ifdef _MSC_VER #ifdef _MSC_VER
@ -5246,7 +5246,7 @@ mpd_restore_fenv(unsigned int cw)
* Multiply u and v, using the fast number theoretic transform. Returns * Multiply u and v, using the fast number theoretic transform. Returns
* a pointer to the result or NULL in case of failure (malloc error). * a pointer to the result or NULL in case of failure (malloc error).
*/ */
mpd_uint_t * static mpd_uint_t *
_mpd_fntmul(const mpd_uint_t *u, const mpd_uint_t *v, _mpd_fntmul(const mpd_uint_t *u, const mpd_uint_t *v,
mpd_size_t ulen, mpd_size_t vlen, mpd_size_t ulen, mpd_size_t vlen,
mpd_size_t *rsize) mpd_size_t *rsize)
@ -5432,7 +5432,7 @@ _karatsuba_rec_fnt(mpd_uint_t *c, const mpd_uint_t *a, const mpd_uint_t *b,
* base case. Returns a pointer to the result or NULL in case of failure * base case. Returns a pointer to the result or NULL in case of failure
* (malloc error). Conditions: ulen >= vlen, ulen >= 4. * (malloc error). Conditions: ulen >= vlen, ulen >= 4.
*/ */
mpd_uint_t * static mpd_uint_t *
_mpd_kmul_fnt(const mpd_uint_t *u, const mpd_uint_t *v, _mpd_kmul_fnt(const mpd_uint_t *u, const mpd_uint_t *v,
mpd_size_t ulen, mpd_size_t vlen, mpd_size_t ulen, mpd_size_t vlen,
mpd_size_t *rsize) mpd_size_t *rsize)