commit 8ca63f95f769c31f65a996fe065ff6dcfb490bbe
author Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> Wed Jul 15 06:01:10 2020 -0700
committer GitHub <noreply@github.com> Wed Jul 15 06:01:10 2020 -0700
tree 06bfdb94ec9d5d37a3b56c6d312a89771b423954
parent f3232294ee695492f43d424cc6969d018d49861d

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

Co-authored-by: Felix Yan <felixonmars@archlinux.org>

Modules/_decimal/_decimal.c

diff --git a/Modules/_decimal/_decimal.c b/Modules/_decimal/_decimal.c
index ff7c647..fb4e020 100644
--- a/Modules/_decimal/_decimal.c
+++ b/Modules/_decimal/_decimal.c
@@ -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

Modules/_decimal/libmpdec/mpdecimal.h

diff --git a/Modules/_decimal/libmpdec/mpdecimal.h b/Modules/_decimal/libmpdec/mpdecimal.h
index 108b76e..2815a8c 100644
--- a/Modules/_decimal/libmpdec/mpdecimal.h
+++ b/Modules/_decimal/libmpdec/mpdecimal.h
@@ -61,12 +61,6 @@
   #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