mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-27 02:39:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

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

Browse source 
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.
(cherry picked from commit 015efdbef7)

Co-authored-by: Felix Yan <felixonmars@archlinux.org>
This commit is contained in:
Miss Islington (bot) 2020-07-15 06:01:10 -07:00 • committed by GitHub
parent f3232294ee
commit 8ca63f95f7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 6 deletions
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
#if defined(__GNUC__) && !defined(__INTEL_COMPILER)
#define UNUSED __attribute__((unused))
#else
#define UNUSED
#endif
/* _Py_DEC_MINALLOC >= MPD_MINALLOC */
#define _Py_DEC_MINALLOC 4

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

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