traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge 3.4.

This commit is contained in:
Stefan Krah 2014-08-26 21:32:26 +02:00
parent 9ea83cff47 cf26115651
commit fc452518e6
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Lib/decimal.py
View File

@ -140,7 +140,7 @@ __all__ = [
__version__ = '1.70' # Highest version of the spec this complies with __version__ = '1.70' # Highest version of the spec this complies with
# See http://speleotrove.com/decimal/ # See http://speleotrove.com/decimal/
__libmpdec_version__ = "2.4.0" # compatible libmpdec version __libmpdec_version__ = "2.4.1" # compatible libmpdec version
import math as _math import math as _math
import numbers as _numbers import numbers as _numbers

4
Modules/_decimal/_decimal.c
View File

@ -39,8 +39,8 @@
#include "memory.h" #include "memory.h"
#if MPD_MAJOR_VERSION != 2 #if !defined(MPD_VERSION_HEX) || MPD_VERSION_HEX < 0x02040100
#error "libmpdec major version 2 required" #error "libmpdec version >= 2.4.1 required"
#endif #endif

8
Modules/_decimal/libmpdec/mpdecimal.h
View File

@ -108,9 +108,13 @@ MPD_PRAGMA(MPD_HIDE_SYMBOLS_START)
#define MPD_MAJOR_VERSION 2 #define MPD_MAJOR_VERSION 2
#define MPD_MINOR_VERSION 4 #define MPD_MINOR_VERSION 4
#define MPD_MICRO_VERSION 0 #define MPD_MICRO_VERSION 1
#define MPD_VERSION "2.4.0" #define MPD_VERSION "2.4.1"
#define MPD_VERSION_HEX ((MPD_MAJOR_VERSION << 24) | \
(MPD_MINOR_VERSION << 16) | \
(MPD_MICRO_VERSION << 8))
const char *mpd_version(void); const char *mpd_version(void);