mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-01 18:51:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 21

Merge 3.4.

Browse source
This commit is contained in:
Stefan Krah 2014-08-26 21:32:26 +02:00
commit fc452518e6
3 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Modules/_decimal/_decimal.c
View file

@ -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

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_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);