]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
bpo-45067 - Verify the version of ncurses for extended color support feature usage...
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Thu, 9 Sep 2021 19:38:54 +0000 (12:38 -0700)
committerPablo Galindo <pablogsal@gmail.com>
Wed, 29 Sep 2021 11:39:01 +0000 (12:39 +0100)
* issue45067 - Fix _curses compilation in CentOS 7. Verify the version of ncurses
for extended color support feature usage.

The function extended_color_content was introduced in 2017.  The ncurses-devel
package in CentOS 7 had a older version ncurses resulted in compilation error.
For compiling ncurses with extended color support, we verify the version of the
ncurses library.

Co-authored-by: blurb-it[bot] <43283697+blurb-it[bot]@users.noreply.github.com>
Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
(cherry picked from commit 794430700defb913512f871b701a888aa730de81)

Co-authored-by: Senthil Kumaran <senthil@python.org>
Modules/_cursesmodule.c

index 61aaf855229f862ed429e7f7953fc03d0edd7edd..511073f2ac13799a467949c3ab53a232c41e127c 100644 (file)
@@ -135,11 +135,11 @@ typedef chtype attr_t;           /* No attr_t type is available */
 #define STRICT_SYSV_CURSES
 #endif
 
-#if NCURSES_EXT_COLORS+0 && NCURSES_EXT_FUNCS+0
+#if NCURSES_EXT_FUNCS+0 >= 20170401 && NCURSES_EXT_COLORS+0 >= 20170401
 #define _NCURSES_EXTENDED_COLOR_FUNCS   1
 #else
 #define _NCURSES_EXTENDED_COLOR_FUNCS   0
-#endif  /* defined(NCURSES_EXT_COLORS) && defined(NCURSES_EXT_FUNCS)  */
+#endif
 
 #if _NCURSES_EXTENDED_COLOR_FUNCS
 #define _CURSES_COLOR_VAL_TYPE          int