diff options
| author | Stefan Krah <skrah@bytereef.org> | 2014-08-26 21:32:26 +0200 |
|---|---|---|
| committer | Stefan Krah <skrah@bytereef.org> | 2014-08-26 21:32:26 +0200 |
| commit | fc452518e62a0635a98517f71dccd256e202e433 (patch) | |
| tree | eb398aaaf1141e9b030bf832006672a8302cc1db /Modules/_decimal | |
| parent | 9ea83cff473a8dea3fa4c34e0036c3de3e09b77e (diff) | |
| parent | cf26115651c4c5cfc92776fd7204d7a218241e88 (diff) | |
| download | cpython-git-fc452518e62a0635a98517f71dccd256e202e433.tar.gz | |
Merge 3.4.
Diffstat (limited to 'Modules/_decimal')
| -rw-r--r-- | Modules/_decimal/_decimal.c | 4 | ||||
| -rw-r--r-- | Modules/_decimal/libmpdec/mpdecimal.h | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/Modules/_decimal/_decimal.c b/Modules/_decimal/_decimal.c index 8be9be6489..f00088736e 100644 --- a/Modules/_decimal/_decimal.c +++ b/Modules/_decimal/_decimal.c @@ -39,8 +39,8 @@ #include "memory.h" -#if MPD_MAJOR_VERSION != 2 - #error "libmpdec major version 2 required" +#if !defined(MPD_VERSION_HEX) || MPD_VERSION_HEX < 0x02040100 + #error "libmpdec version >= 2.4.1 required" #endif diff --git a/Modules/_decimal/libmpdec/mpdecimal.h b/Modules/_decimal/libmpdec/mpdecimal.h index b43231c4b8..5ca74135bf 100644 --- a/Modules/_decimal/libmpdec/mpdecimal.h +++ b/Modules/_decimal/libmpdec/mpdecimal.h @@ -108,9 +108,13 @@ MPD_PRAGMA(MPD_HIDE_SYMBOLS_START) #define MPD_MAJOR_VERSION 2 #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); |