Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

bpo-41302: Fix build with system libmpdec (GH-21481) 

Move definition of UNUSED from modified headers of libmpdec to
_decimal.c itself. This makes the vendored source closer to the
standalone library and fixes build with --with-system-libmpdec.

Tested to build fine with either system libmpdec or the vendored one.
This commit is contained in:
Felix Yan 2020-07-15 20:14:11 +08:00 committed by GitHub
parent 5a8d121a1f
commit 015efdbef7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Modules/_decimal/_decimal.c
View File

@ -56,6 +56,11 @@
#define BOUNDS_CHECK(x, MIN, MAX) x = (x < MIN || MAX < x) ? MAX : x #define BOUNDS_CHECK(x, MIN, MAX) x = (x < MIN || MAX < x) ? MAX : x
#if defined(__GNUC__) && !defined(__INTEL_COMPILER)
#define UNUSED __attribute__((unused))
#else
#define UNUSED
#endif
/* _Py_DEC_MINALLOC >= MPD_MINALLOC */ /* _Py_DEC_MINALLOC >= MPD_MINALLOC */
#define _Py_DEC_MINALLOC 4 #define _Py_DEC_MINALLOC 4

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

@ -61,12 +61,6 @@ extern "C" {
#define MPD_HIDE_SYMBOLS_END #define MPD_HIDE_SYMBOLS_END
#endif #endif
#if defined(__GNUC__) && !defined(__INTEL_COMPILER)
#define UNUSED __attribute__((unused))
#else
#define UNUSED
#endif
#if defined(_MSC_VER) #if defined(_MSC_VER)
#include "vccompat.h" #include "vccompat.h"
#define EXTINLINE extern inline #define EXTINLINE extern inline