From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Fri, 30 May 2025 05:08:43 +0000 (+0200)
Subject: [3.14] gh-134768: Fix definition of `mt_continue_should_break()` (GH-134769) (#134916)
X-Git-Tag: v3.14.0b3~133
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e0e8f28f27bb447ffd021e4d4fde0ddd7aa5500b;p=thirdparty%2FPython%2Fcpython.git

[3.14] gh-134768: Fix definition of `mt_continue_should_break()` (GH-134769) (#134916)

gh-134768: Fix definition of `mt_continue_should_break()` (GH-134769)

In 121ed71f4e395948d313249b2ad33e1e21581f8a, mt_continue_should_break
was changed to be guarded by `Py_DEBUG`, but it's used in `compress_mt_continue_lock_held`
with just `assert`, so it needs to be available when `NDEBUG` is undefined
too.

`Py_DEBUG` implies `NDEBUG` is undefined, so we can check just that.
(cherry picked from commit 2f2bee21118adce653ee5bc4eb31d30327465966)


Fixes: 121ed71f4e395948d313249b2ad33e1e21581f8a

Co-authored-by: Sam James <sam@gentoo.org>
---

diff --git a/Modules/_zstd/compressor.c b/Modules/_zstd/compressor.c
index 0fc3d7d36c68..8ff2a3aadc1c 100644
--- a/Modules/_zstd/compressor.c
+++ b/Modules/_zstd/compressor.c
@@ -512,7 +512,7 @@ error:
     return NULL;
 }
 
-#ifdef Py_DEBUG
+#ifndef NDEBUG
 static inline int
 mt_continue_should_break(ZSTD_inBuffer *in, ZSTD_outBuffer *out)
 {