https://github.com/python/cpython/commit/0b5e26c6b1567f93abb6d3c755879d4e8070d503
commit: 0b5e26c6b1567f93abb6d3c755879d4e8070d503
branch: main
author: Victor Stinner <[email protected]>
committer: vstinner <[email protected]>
date: 2026-11-19T17:46:03+01:00
summary:
gh-157695: Make HAVE_CURSES_xxx macros private (#162212)
Rename HAVE_CURSES_xxx macros, added to Python 3.16, to
_Py_HAVE_CURSES_xxx.
Rename macros of functions:
* define_key(): HAVE_CURSES_DEFINE_KEY
* has_mouse(): HAVE_CURSES_HAS_MOUSE
* is_keypad(): HAVE_CURSES_IS_KEYPAD
* is_leaveok(): HAVE_CURSES_IS_LEAVEOK
* key_defined(): HAVE_CURSES_KEY_DEFINED
* keyok(): HAVE_CURSES_KEYOK
* new_prescr(): HAVE_CURSES_NEW_PRESCR
* nofilter(): HAVE_CURSES_NOFILTER
* scr_dump(): HAVE_CURSES_SCR_DUMP
* scr_set(): HAVE_CURSES_SCR_SET
* slk_attr_off(): HAVE_CURSES_SLK_ATTR_OFF
* slk_attr_on(): HAVE_CURSES_SLK_ATTR_ON
* slk_attr_set(): HAVE_CURSES_SLK_ATTR_SET
* slk_color(): HAVE_CURSES_SLK_COLOR
* term_attrs(): HAVE_CURSES_TERM_ATTRS
* use_screen(): HAVE_CURSES_USE_SCREEN
* use_window(): HAVE_CURSES_USE_WINDOW
* wattr_get(): HAVE_CURSES_WATTR_GET
* wattr_off(): HAVE_CURSES_WATTR_OFF
* wattr_on(): HAVE_CURSES_WATTR_ON
* wattr_set(): HAVE_CURSES_WATTR_SET
* wcolor_set(): HAVE_CURSES_WCOLOR_SET
Add PY_CHECK_CURSES_FUNC_PRIVATE() function to configure.ac.
files:
M Modules/_cursesmodule.c
M Modules/clinic/_cursesmodule.c.h
M Tools/build/check_capi_macros_ignored.txt
M configure
M configure.ac
M pyconfig.h.in
diff --git a/Modules/_cursesmodule.c b/Modules/_cursesmodule.c
index 52b87e7cc0e8b9..e82c78691c7f6a 100644
--- a/Modules/_cursesmodule.c
+++ b/Modules/_cursesmodule.c
@@ -1936,10 +1936,10 @@ Window_NoArgTrueFalseFunction(is_scrollok)
Window_NoArgTrueFalseFunction(is_subwin)
Window_NoArgTrueFalseFunction(is_syncok)
#endif
-#if defined(HAVE_CURSES_IS_KEYPAD) || defined(PDCURSES)
+#if defined(_Py__Py_HAVE_CURSES_IS_KEYPAD) || defined(PDCURSES)
Window_NoArgTrueFalseFunction(is_keypad)
#endif
-#if defined(HAVE_CURSES_IS_LEAVEOK) || defined(PDCURSES)
+#if defined(_Py_HAVE_CURSES_IS_LEAVEOK) || defined(PDCURSES)
Window_NoArgTrueFalseFunction(is_leaveok)
#endif
#if defined(HAVE_CURSES_IS_PAD) || defined(PDCURSES)
@@ -2199,7 +2199,7 @@ static int
curses_wattr_save(PyCursesWindowObject *self, attr_t *attrs, int *pair,
const char *funcname)
{
-#if defined(HAVE_CURSES_WATTR_GET) && defined(HAVE_CURSES_WATTR_SET)
+#if defined(_Py_HAVE_CURSES_WATTR_GET) && defined(_Py_HAVE_CURSES_WATTR_SET)
int rtn;
#if _NCURSES_EXTENDED_COLOR_FUNCS
short legacy_pair;
@@ -2222,7 +2222,7 @@ curses_wattr_save(PyCursesWindowObject *self, attr_t
*attrs, int *pair,
/* Put the rendition back. The name of the curses function used is
_CURSES_WATTR_RESTORE_FUNC, for the caller to name it in an error. */
-#if defined(HAVE_CURSES_WATTR_GET) && defined(HAVE_CURSES_WATTR_SET)
+#if defined(_Py_HAVE_CURSES_WATTR_GET) && defined(_Py_HAVE_CURSES_WATTR_SET)
#define _CURSES_WATTR_RESTORE_FUNC "wattr_set"
#else
#define _CURSES_WATTR_RESTORE_FUNC "wattrset"
@@ -2231,7 +2231,7 @@ curses_wattr_save(PyCursesWindowObject *self, attr_t
*attrs, int *pair,
static int
curses_wattr_restore(PyCursesWindowObject *self, attr_t attrs, int pair)
{
-#if defined(HAVE_CURSES_WATTR_GET) && defined(HAVE_CURSES_WATTR_SET)
+#if defined(_Py_HAVE_CURSES_WATTR_GET) && defined(_Py_HAVE_CURSES_WATTR_SET)
#if _NCURSES_EXTENDED_COLOR_FUNCS
return wattr_set(self->win, attrs, 0, &pair);
#else
@@ -2558,7 +2558,7 @@ _curses_window_attrset_impl(PyCursesWindowObject *self,
attr_t attr)
return curses_window_check_err(self, rtn, "wattrset", "attrset");
}
-#ifdef HAVE_CURSES_WATTR_GET
+#ifdef _Py_HAVE_CURSES_WATTR_GET
/*[clinic input]
_curses.window.attr_get
@@ -2584,9 +2584,9 @@ _curses_window_attr_get_impl(PyCursesWindowObject *self)
}
return Py_BuildValue("(ki)", (unsigned long)attrs, (int)pair);
}
-#endif /* HAVE_CURSES_WATTR_GET */
+#endif /* _Py_HAVE_CURSES_WATTR_GET */
-#ifdef HAVE_CURSES_WATTR_SET
+#ifdef _Py_HAVE_CURSES_WATTR_SET
/*[clinic input]
_curses.window.attr_set
@@ -2610,9 +2610,9 @@ _curses_window_attr_set_impl(PyCursesWindowObject *self,
attr_t attr,
#endif
return curses_window_check_err(self, rtn, "wattr_set", "attr_set");
}
-#endif /* HAVE_CURSES_WATTR_SET */
+#endif /* _Py_HAVE_CURSES_WATTR_SET */
-#ifdef HAVE_CURSES_WATTR_ON
+#ifdef _Py_HAVE_CURSES_WATTR_ON
/*[clinic input]
_curses.window.attr_on
@@ -2629,9 +2629,9 @@ _curses_window_attr_on_impl(PyCursesWindowObject *self,
attr_t attr)
int rtn = wattr_on(self->win, attr, NULL);
return curses_window_check_err(self, rtn, "wattr_on", "attr_on");
}
-#endif /* HAVE_CURSES_WATTR_ON */
+#endif /* _Py_HAVE_CURSES_WATTR_ON */
-#ifdef HAVE_CURSES_WATTR_OFF
+#ifdef _Py_HAVE_CURSES_WATTR_OFF
/*[clinic input]
_curses.window.attr_off
@@ -2648,9 +2648,9 @@ _curses_window_attr_off_impl(PyCursesWindowObject *self,
attr_t attr)
int rtn = wattr_off(self->win, attr, NULL);
return curses_window_check_err(self, rtn, "wattr_off", "attr_off");
}
-#endif /* HAVE_CURSES_WATTR_OFF */
+#endif /* _Py_HAVE_CURSES_WATTR_OFF */
-#ifdef HAVE_CURSES_WCOLOR_SET
+#ifdef _Py_HAVE_CURSES_WCOLOR_SET
/*[clinic input]
_curses.window.color_set
@@ -2672,7 +2672,7 @@ _curses_window_color_set_impl(PyCursesWindowObject *self,
int pair)
#endif
return curses_window_check_err(self, rtn, "wcolor_set", "color_set");
}
-#endif /* HAVE_CURSES_WCOLOR_SET */
+#endif /* _Py_HAVE_CURSES_WCOLOR_SET */
/*[clinic input]
_curses.window.getattrs
@@ -5035,7 +5035,7 @@ static PyType_Spec PyCursesComplexStr_Type_spec = {
};
#undef clinic_state
-#if defined(HAVE_CURSES_USE_SCREEN) || defined(HAVE_CURSES_USE_WINDOW)
+#if defined(_Py_HAVE_CURSES_USE_SCREEN) || defined(_Py_HAVE_CURSES_USE_WINDOW)
/* Shared trampoline for window.use()/screen.use(): call
func(obj, *extra, **kwargs) and store the result (NULL on exception) in
data->result. */
@@ -5085,7 +5085,7 @@ curses_use_parse(PyObject *args, PyObject **func,
PyObject **extra)
}
#endif
-#ifdef HAVE_CURSES_USE_WINDOW
+#ifdef _Py_HAVE_CURSES_USE_WINDOW
static int
curses_use_window_cb(WINDOW *Py_UNUSED(win), void *data)
{
@@ -5111,7 +5111,7 @@ PyCursesWindow_use(PyObject *self, PyObject *args,
PyObject *kwargs)
Py_DECREF(extra);
return data.result;
}
-#endif /* HAVE_CURSES_USE_WINDOW */
+#endif /* _Py_HAVE_CURSES_USE_WINDOW */
static PyMethodDef PyCursesWindow_methods[] = {
_CURSES_WINDOW_ADDCH_METHODDEF
@@ -5250,12 +5250,12 @@ static PyMethodDef PyCursesWindow_methods[] = {
"is_syncok($self, /)\n--\n\n"
"Return the current value set by syncok()."},
#endif
-#if defined(HAVE_CURSES_IS_KEYPAD) || defined(PDCURSES)
+#if defined(_Py__Py_HAVE_CURSES_IS_KEYPAD) || defined(PDCURSES)
{"is_keypad", PyCursesWindow_is_keypad, METH_NOARGS,
"is_keypad($self, /)\n--\n\n"
"Return the current value set by keypad()."},
#endif
-#if defined(HAVE_CURSES_IS_LEAVEOK) || defined(PDCURSES)
+#if defined(_Py_HAVE_CURSES_IS_LEAVEOK) || defined(PDCURSES)
{"is_leaveok", PyCursesWindow_is_leaveok, METH_NOARGS,
"is_leaveok($self, /)\n--\n\n"
"Return the current value set by leaveok()."},
@@ -5336,7 +5336,7 @@ static PyMethodDef PyCursesWindow_methods[] = {
"untouchwin($self, /)\n--\n\n"
"Mark all lines in the window as unchanged since last refresh()."},
_CURSES_WINDOW_VLINE_METHODDEF
-#ifdef HAVE_CURSES_USE_WINDOW
+#ifdef _Py_HAVE_CURSES_USE_WINDOW
{"use", _PyCFunction_CAST(PyCursesWindow_use),
METH_VARARGS | METH_KEYWORDS, PyCursesWindow_use__doc__},
#endif
@@ -5478,7 +5478,7 @@ static PyGetSetDef PyCursesScreen_getsets[] = {
{NULL, NULL, NULL, NULL, NULL} /* sentinel */
};
-#ifdef HAVE_CURSES_USE_SCREEN
+#ifdef _Py_HAVE_CURSES_USE_SCREEN
static int
curses_use_screen_cb(SCREEN *Py_UNUSED(sp), void *data)
{
@@ -5533,7 +5533,7 @@ PyCursesScreen_use(PyObject *self, PyObject *args,
PyObject *kwargs)
}
return data.result;
}
-#endif /* HAVE_CURSES_USE_SCREEN */
+#endif /* _Py_HAVE_CURSES_USE_SCREEN */
PyDoc_STRVAR(PyCursesScreen_close__doc__,
"close($self, /)\n--\n\n"
@@ -5552,7 +5552,7 @@ PyCursesScreen_close(PyObject *self, PyObject
*Py_UNUSED(ignored))
static PyMethodDef PyCursesScreen_methods[] = {
{"close", PyCursesScreen_close, METH_NOARGS,
PyCursesScreen_close__doc__},
-#ifdef HAVE_CURSES_USE_SCREEN
+#ifdef _Py_HAVE_CURSES_USE_SCREEN
{"use", _PyCFunction_CAST(PyCursesScreen_use),
METH_VARARGS | METH_KEYWORDS, PyCursesScreen_use__doc__},
#endif
@@ -5704,7 +5704,7 @@ _curses_filter_impl(PyObject *module)
}
#endif
-#ifdef HAVE_CURSES_NOFILTER
+#ifdef _Py_HAVE_CURSES_NOFILTER
/*[clinic input]
_curses.nofilter
@@ -6269,7 +6269,7 @@ _curses_getwin(PyObject *module, PyObject *file)
return res;
}
-#ifdef HAVE_CURSES_SCR_DUMP
+#ifdef _Py_HAVE_CURSES_SCR_DUMP
/*[clinic input]
_curses.scr_dump
@@ -6324,7 +6324,7 @@ _curses_scr_init(PyObject *module, PyObject *filename)
/*[clinic end generated code: output=2e861d381d710419 input=81c45e4702124ef6]*/
ScreenDumpFunctionBody(scr_init)
-#ifdef HAVE_CURSES_SCR_SET
+#ifdef _Py_HAVE_CURSES_SCR_SET
/*[clinic input]
_curses.scr_set
@@ -6341,8 +6341,8 @@ static PyObject *
_curses_scr_set(PyObject *module, PyObject *filename)
/*[clinic end generated code: output=6056fdec12c5935f input=d248c20543cc289b]*/
ScreenDumpFunctionBody(scr_set)
-#endif /* HAVE_CURSES_SCR_SET */
-#endif /* HAVE_CURSES_SCR_DUMP */
+#endif /* _Py_HAVE_CURSES_SCR_SET */
+#endif /* _Py_HAVE_CURSES_SCR_DUMP */
/*[clinic input]
_curses.halfdelay
@@ -6421,7 +6421,7 @@ _curses_has_key_impl(PyObject *module, int key)
}
#endif
-#ifdef HAVE_CURSES_DEFINE_KEY
+#ifdef _Py_HAVE_CURSES_DEFINE_KEY
/*[clinic input]
_curses.define_key
@@ -6447,9 +6447,9 @@ _curses_define_key_impl(PyObject *module, const char
*definition,
return curses_check_err(module, define_key(definition, keycode),
"define_key", NULL);
}
-#endif /* HAVE_CURSES_DEFINE_KEY */
+#endif /* _Py_HAVE_CURSES_DEFINE_KEY */
-#ifdef HAVE_CURSES_KEY_DEFINED
+#ifdef _Py_HAVE_CURSES_KEY_DEFINED
/*[clinic input]
_curses.key_defined
@@ -6471,9 +6471,9 @@ _curses_key_defined_impl(PyObject *module, const char
*definition)
return PyLong_FromLong(key_defined(definition));
}
-#endif /* HAVE_CURSES_KEY_DEFINED */
+#endif /* _Py_HAVE_CURSES_KEY_DEFINED */
-#ifdef HAVE_CURSES_KEYOK
+#ifdef _Py_HAVE_CURSES_KEYOK
/*[clinic input]
_curses.keyok
@@ -6494,7 +6494,7 @@ _curses_keyok_impl(PyObject *module, int keycode, int
enable)
return curses_check_err(module, keyok(keycode, enable), "keyok", NULL);
}
-#endif /* HAVE_CURSES_KEYOK */
+#endif /* _Py_HAVE_CURSES_KEYOK */
/*[clinic input]
_curses.init_color
@@ -7283,7 +7283,7 @@ _curses_set_term(PyObject *module, PyObject *screen)
return prev != NULL ? prev : Py_NewRef(Py_None);
}
-#ifdef HAVE_CURSES_NEW_PRESCR
+#ifdef _Py_HAVE_CURSES_NEW_PRESCR
/*[clinic input]
_curses.new_prescr
@@ -7317,7 +7317,7 @@ _curses_new_prescr_impl(PyObject *module)
state->prescreen = Py_NewRef(screenobj);
return screenobj;
}
-#endif /* HAVE_CURSES_NEW_PRESCR */
+#endif /* _Py_HAVE_CURSES_NEW_PRESCR */
#ifdef HAVE_CURSES_ESCDELAY
/*[clinic input]
@@ -7573,7 +7573,7 @@ _curses_meta_impl(PyObject *module, int yes)
}
#if defined(HAVE_CURSES_GETMOUSE) || defined(PDCURSES)
-#if defined(HAVE_CURSES_HAS_MOUSE) || defined(PDCURSES)
+#if defined(_Py_HAVE_CURSES_HAS_MOUSE) || defined(PDCURSES)
/*[clinic input]
_curses.has_mouse
@@ -7588,7 +7588,7 @@ _curses_has_mouse_impl(PyObject *module)
return PyBool_FromLong(has_mouse());
}
-#endif /* HAVE_CURSES_HAS_MOUSE || PDCURSES */
+#endif /* _Py_HAVE_CURSES_HAS_MOUSE || PDCURSES */
/*[clinic input]
_curses.mouseinterval
@@ -8272,7 +8272,7 @@ _curses_termattrs_impl(PyObject *module)
return PyLong_FromUnsignedLong((unsigned long)(chtype)termattrs());
}
-#ifdef HAVE_CURSES_TERM_ATTRS
+#ifdef _Py_HAVE_CURSES_TERM_ATTRS
/*[clinic input]
_curses.term_attrs
@@ -8290,7 +8290,7 @@ _curses_term_attrs_impl(PyObject *module)
return PyLong_FromUnsignedLongLong(term_attrs());
}
-#endif /* HAVE_CURSES_TERM_ATTRS */
+#endif /* _Py_HAVE_CURSES_TERM_ATTRS */
/*[clinic input]
@permit_long_summary
@@ -8877,7 +8877,7 @@ _curses_slk_attr_impl(PyObject *module)
}
#endif
-#ifdef HAVE_CURSES_SLK_ATTR_ON
+#ifdef _Py_HAVE_CURSES_SLK_ATTR_ON
/*[clinic input]
_curses.slk_attr_on
@@ -8895,9 +8895,9 @@ _curses_slk_attr_on_impl(PyObject *module, attr_t attr)
return curses_check_err(module, slk_attr_on(attr, NULL),
"slk_attr_on", NULL);
}
-#endif /* HAVE_CURSES_SLK_ATTR_ON */
+#endif /* _Py_HAVE_CURSES_SLK_ATTR_ON */
-#ifdef HAVE_CURSES_SLK_ATTR_OFF
+#ifdef _Py_HAVE_CURSES_SLK_ATTR_OFF
/*[clinic input]
_curses.slk_attr_off
@@ -8915,9 +8915,9 @@ _curses_slk_attr_off_impl(PyObject *module, attr_t attr)
return curses_check_err(module, slk_attr_off(attr, NULL),
"slk_attr_off", NULL);
}
-#endif /* HAVE_CURSES_SLK_ATTR_OFF */
+#endif /* _Py_HAVE_CURSES_SLK_ATTR_OFF */
-#ifdef HAVE_CURSES_SLK_ATTR_SET
+#ifdef _Py_HAVE_CURSES_SLK_ATTR_SET
/*[clinic input]
_curses.slk_attr_set
@@ -8941,9 +8941,9 @@ _curses_slk_attr_set_impl(PyObject *module, attr_t attr,
int pair)
#endif
return curses_check_err(module, rtn, "slk_attr_set", NULL);
}
-#endif /* HAVE_CURSES_SLK_ATTR_SET */
+#endif /* _Py_HAVE_CURSES_SLK_ATTR_SET */
-#ifdef HAVE_CURSES_SLK_COLOR
+#ifdef _Py_HAVE_CURSES_SLK_COLOR
/*[clinic input]
_curses.slk_color
@@ -8966,7 +8966,7 @@ _curses_slk_color_impl(PyObject *module, int pair)
#endif
return curses_check_err(module, rtn, "slk_color", NULL);
}
-#endif /* HAVE_CURSES_SLK_COLOR */
+#endif /* _Py_HAVE_CURSES_SLK_COLOR */
#ifdef HAVE_CURSES_USE_ENV
/*[clinic input]
@@ -9178,7 +9178,7 @@ static PyMethodDef cursesmodule_methods[] = {
_CURSES_NEWPAD_METHODDEF
_CURSES_NEWTERM_METHODDEF
_CURSES_NEWWIN_METHODDEF
-#ifdef HAVE_CURSES_NEW_PRESCR
+#ifdef _Py_HAVE_CURSES_NEW_PRESCR
_CURSES_NEW_PRESCR_METHODDEF
#endif
_CURSES_NL_METHODDEF
diff --git a/Modules/clinic/_cursesmodule.c.h b/Modules/clinic/_cursesmodule.c.h
index 553843ab96a7af..39512bc6cad3d6 100644
--- a/Modules/clinic/_cursesmodule.c.h
+++ b/Modules/clinic/_cursesmodule.c.h
@@ -520,7 +520,7 @@ _curses_window_attrset(PyObject *self, PyObject *arg)
return return_value;
}
-#if defined(HAVE_CURSES_WATTR_GET)
+#if defined(_Py_HAVE_CURSES_WATTR_GET)
PyDoc_STRVAR(_curses_window_attr_get__doc__,
"attr_get($self, /)\n"
@@ -540,9 +540,9 @@ _curses_window_attr_get(PyObject *self, PyObject
*Py_UNUSED(ignored))
return _curses_window_attr_get_impl((PyCursesWindowObject *)self);
}
-#endif /* defined(HAVE_CURSES_WATTR_GET) */
+#endif /* defined(_Py_HAVE_CURSES_WATTR_GET) */
-#if defined(HAVE_CURSES_WATTR_SET)
+#if defined(_Py_HAVE_CURSES_WATTR_SET)
PyDoc_STRVAR(_curses_window_attr_set__doc__,
"attr_set($self, attr, pair=0, /)\n"
@@ -583,9 +583,9 @@ _curses_window_attr_set(PyObject *self, PyObject *const
*args, Py_ssize_t nargs)
return return_value;
}
-#endif /* defined(HAVE_CURSES_WATTR_SET) */
+#endif /* defined(_Py_HAVE_CURSES_WATTR_SET) */
-#if defined(HAVE_CURSES_WATTR_ON)
+#if defined(_Py_HAVE_CURSES_WATTR_ON)
PyDoc_STRVAR(_curses_window_attr_on__doc__,
"attr_on($self, attr, /)\n"
@@ -614,9 +614,9 @@ _curses_window_attr_on(PyObject *self, PyObject *arg)
return return_value;
}
-#endif /* defined(HAVE_CURSES_WATTR_ON) */
+#endif /* defined(_Py_HAVE_CURSES_WATTR_ON) */
-#if defined(HAVE_CURSES_WATTR_OFF)
+#if defined(_Py_HAVE_CURSES_WATTR_OFF)
PyDoc_STRVAR(_curses_window_attr_off__doc__,
"attr_off($self, attr, /)\n"
@@ -645,9 +645,9 @@ _curses_window_attr_off(PyObject *self, PyObject *arg)
return return_value;
}
-#endif /* defined(HAVE_CURSES_WATTR_OFF) */
+#endif /* defined(_Py_HAVE_CURSES_WATTR_OFF) */
-#if defined(HAVE_CURSES_WCOLOR_SET)
+#if defined(_Py_HAVE_CURSES_WCOLOR_SET)
PyDoc_STRVAR(_curses_window_color_set__doc__,
"color_set($self, pair, /)\n"
@@ -676,7 +676,7 @@ _curses_window_color_set(PyObject *self, PyObject *arg)
return return_value;
}
-#endif /* defined(HAVE_CURSES_WCOLOR_SET) */
+#endif /* defined(_Py_HAVE_CURSES_WCOLOR_SET) */
PyDoc_STRVAR(_curses_window_getattrs__doc__,
"getattrs($self, /)\n"
@@ -2867,7 +2867,7 @@ _curses_filter(PyObject *module, PyObject
*Py_UNUSED(ignored))
#endif /* defined(HAVE_CURSES_FILTER) */
-#if defined(HAVE_CURSES_NOFILTER)
+#if defined(_Py_HAVE_CURSES_NOFILTER)
PyDoc_STRVAR(_curses_nofilter__doc__,
"nofilter($module, /)\n"
@@ -2891,7 +2891,7 @@ _curses_nofilter(PyObject *module, PyObject
*Py_UNUSED(ignored))
return _curses_nofilter_impl(module);
}
-#endif /* defined(HAVE_CURSES_NOFILTER) */
+#endif /* defined(_Py_HAVE_CURSES_NOFILTER) */
PyDoc_STRVAR(_curses_baudrate__doc__,
"baudrate($module, /)\n"
@@ -3566,7 +3566,7 @@ PyDoc_STRVAR(_curses_getwin__doc__,
#define _CURSES_GETWIN_METHODDEF \
{"getwin", (PyCFunction)_curses_getwin, METH_O, _curses_getwin__doc__},
-#if defined(HAVE_CURSES_SCR_DUMP)
+#if defined(_Py_HAVE_CURSES_SCR_DUMP)
PyDoc_STRVAR(_curses_scr_dump__doc__,
"scr_dump($module, filename, /)\n"
@@ -3583,9 +3583,9 @@ PyDoc_STRVAR(_curses_scr_dump__doc__,
#define _CURSES_SCR_DUMP_METHODDEF \
{"scr_dump", (PyCFunction)_curses_scr_dump, METH_O,
_curses_scr_dump__doc__},
-#endif /* defined(HAVE_CURSES_SCR_DUMP) */
+#endif /* defined(_Py_HAVE_CURSES_SCR_DUMP) */
-#if defined(HAVE_CURSES_SCR_DUMP)
+#if defined(_Py_HAVE_CURSES_SCR_DUMP)
PyDoc_STRVAR(_curses_scr_restore__doc__,
"scr_restore($module, filename, /)\n"
@@ -3602,9 +3602,9 @@ PyDoc_STRVAR(_curses_scr_restore__doc__,
#define _CURSES_SCR_RESTORE_METHODDEF \
{"scr_restore", (PyCFunction)_curses_scr_restore, METH_O,
_curses_scr_restore__doc__},
-#endif /* defined(HAVE_CURSES_SCR_DUMP) */
+#endif /* defined(_Py_HAVE_CURSES_SCR_DUMP) */
-#if defined(HAVE_CURSES_SCR_DUMP)
+#if defined(_Py_HAVE_CURSES_SCR_DUMP)
PyDoc_STRVAR(_curses_scr_init__doc__,
"scr_init($module, filename, /)\n"
@@ -3621,9 +3621,9 @@ PyDoc_STRVAR(_curses_scr_init__doc__,
#define _CURSES_SCR_INIT_METHODDEF \
{"scr_init", (PyCFunction)_curses_scr_init, METH_O,
_curses_scr_init__doc__},
-#endif /* defined(HAVE_CURSES_SCR_DUMP) */
+#endif /* defined(_Py_HAVE_CURSES_SCR_DUMP) */
-#if defined(HAVE_CURSES_SCR_DUMP) && defined(HAVE_CURSES_SCR_SET)
+#if defined(_Py_HAVE_CURSES_SCR_DUMP) && defined(_Py_HAVE_CURSES_SCR_SET)
PyDoc_STRVAR(_curses_scr_set__doc__,
"scr_set($module, filename, /)\n"
@@ -3639,7 +3639,7 @@ PyDoc_STRVAR(_curses_scr_set__doc__,
#define _CURSES_SCR_SET_METHODDEF \
{"scr_set", (PyCFunction)_curses_scr_set, METH_O, _curses_scr_set__doc__},
-#endif /* defined(HAVE_CURSES_SCR_DUMP) && defined(HAVE_CURSES_SCR_SET) */
+#endif /* defined(_Py_HAVE_CURSES_SCR_DUMP) &&
defined(_Py_HAVE_CURSES_SCR_SET) */
PyDoc_STRVAR(_curses_halfdelay__doc__,
"halfdelay($module, tenths, /)\n"
@@ -3778,7 +3778,7 @@ _curses_has_key(PyObject *module, PyObject *arg)
#endif /* defined(HAVE_CURSES_HAS_KEY) */
-#if defined(HAVE_CURSES_DEFINE_KEY)
+#if defined(_Py_HAVE_CURSES_DEFINE_KEY)
PyDoc_STRVAR(_curses_define_key__doc__,
"define_key($module, definition, keycode, /)\n"
@@ -3834,9 +3834,9 @@ _curses_define_key(PyObject *module, PyObject *const
*args, Py_ssize_t nargs)
return return_value;
}
-#endif /* defined(HAVE_CURSES_DEFINE_KEY) */
+#endif /* defined(_Py_HAVE_CURSES_DEFINE_KEY) */
-#if defined(HAVE_CURSES_KEY_DEFINED)
+#if defined(_Py_HAVE_CURSES_KEY_DEFINED)
PyDoc_STRVAR(_curses_key_defined__doc__,
"key_defined($module, definition, /)\n"
@@ -3876,9 +3876,9 @@ _curses_key_defined(PyObject *module, PyObject *arg)
return return_value;
}
-#endif /* defined(HAVE_CURSES_KEY_DEFINED) */
+#endif /* defined(_Py_HAVE_CURSES_KEY_DEFINED) */
-#if defined(HAVE_CURSES_KEYOK)
+#if defined(_Py_HAVE_CURSES_KEYOK)
PyDoc_STRVAR(_curses_keyok__doc__,
"keyok($module, keycode, enable, /)\n"
@@ -3921,7 +3921,7 @@ _curses_keyok(PyObject *module, PyObject *const *args,
Py_ssize_t nargs)
return return_value;
}
-#endif /* defined(HAVE_CURSES_KEYOK) */
+#endif /* defined(_Py_HAVE_CURSES_KEYOK) */
PyDoc_STRVAR(_curses_init_color__doc__,
"init_color($module, color_number, r, g, b, /)\n"
@@ -4364,7 +4364,7 @@ PyDoc_STRVAR(_curses_set_term__doc__,
#define _CURSES_SET_TERM_METHODDEF \
{"set_term", (PyCFunction)_curses_set_term, METH_O,
_curses_set_term__doc__},
-#if defined(HAVE_CURSES_NEW_PRESCR)
+#if defined(_Py_HAVE_CURSES_NEW_PRESCR)
PyDoc_STRVAR(_curses_new_prescr__doc__,
"new_prescr($module, /)\n"
@@ -4387,7 +4387,7 @@ _curses_new_prescr(PyObject *module, PyObject
*Py_UNUSED(ignored))
return _curses_new_prescr_impl(module);
}
-#endif /* defined(HAVE_CURSES_NEW_PRESCR) */
+#endif /* defined(_Py_HAVE_CURSES_NEW_PRESCR) */
#if defined(HAVE_CURSES_ESCDELAY)
@@ -4731,7 +4731,7 @@ _curses_meta(PyObject *module, PyObject *arg)
return return_value;
}
-#if (defined(HAVE_CURSES_GETMOUSE) || defined(PDCURSES)) &&
(defined(HAVE_CURSES_HAS_MOUSE) || defined(PDCURSES))
+#if (defined(HAVE_CURSES_GETMOUSE) || defined(PDCURSES)) &&
(defined(_Py_HAVE_CURSES_HAS_MOUSE) || defined(PDCURSES))
PyDoc_STRVAR(_curses_has_mouse__doc__,
"has_mouse($module, /)\n"
@@ -4751,7 +4751,7 @@ _curses_has_mouse(PyObject *module, PyObject
*Py_UNUSED(ignored))
return _curses_has_mouse_impl(module);
}
-#endif /* (defined(HAVE_CURSES_GETMOUSE) || defined(PDCURSES)) &&
(defined(HAVE_CURSES_HAS_MOUSE) || defined(PDCURSES)) */
+#endif /* (defined(HAVE_CURSES_GETMOUSE) || defined(PDCURSES)) &&
(defined(_Py_HAVE_CURSES_HAS_MOUSE) || defined(PDCURSES)) */
#if (defined(HAVE_CURSES_GETMOUSE) || defined(PDCURSES))
@@ -5645,7 +5645,7 @@ _curses_termattrs(PyObject *module, PyObject
*Py_UNUSED(ignored))
return _curses_termattrs_impl(module);
}
-#if defined(HAVE_CURSES_TERM_ATTRS)
+#if defined(_Py_HAVE_CURSES_TERM_ATTRS)
PyDoc_STRVAR(_curses_term_attrs__doc__,
"term_attrs($module, /)\n"
@@ -5668,7 +5668,7 @@ _curses_term_attrs(PyObject *module, PyObject
*Py_UNUSED(ignored))
return _curses_term_attrs_impl(module);
}
-#endif /* defined(HAVE_CURSES_TERM_ATTRS) */
+#endif /* defined(_Py_HAVE_CURSES_TERM_ATTRS) */
PyDoc_STRVAR(_curses_termname__doc__,
"termname($module, /)\n"
@@ -6244,7 +6244,7 @@ _curses_slk_attr(PyObject *module, PyObject
*Py_UNUSED(ignored))
#endif /* (defined(NCURSES_EXT_FUNCS) || defined(PDCURSES)) */
-#if defined(HAVE_CURSES_SLK_ATTR_ON)
+#if defined(_Py_HAVE_CURSES_SLK_ATTR_ON)
PyDoc_STRVAR(_curses_slk_attr_on__doc__,
"slk_attr_on($module, attr, /)\n"
@@ -6273,9 +6273,9 @@ _curses_slk_attr_on(PyObject *module, PyObject *arg)
return return_value;
}
-#endif /* defined(HAVE_CURSES_SLK_ATTR_ON) */
+#endif /* defined(_Py_HAVE_CURSES_SLK_ATTR_ON) */
-#if defined(HAVE_CURSES_SLK_ATTR_OFF)
+#if defined(_Py_HAVE_CURSES_SLK_ATTR_OFF)
PyDoc_STRVAR(_curses_slk_attr_off__doc__,
"slk_attr_off($module, attr, /)\n"
@@ -6304,9 +6304,9 @@ _curses_slk_attr_off(PyObject *module, PyObject *arg)
return return_value;
}
-#endif /* defined(HAVE_CURSES_SLK_ATTR_OFF) */
+#endif /* defined(_Py_HAVE_CURSES_SLK_ATTR_OFF) */
-#if defined(HAVE_CURSES_SLK_ATTR_SET)
+#if defined(_Py_HAVE_CURSES_SLK_ATTR_SET)
PyDoc_STRVAR(_curses_slk_attr_set__doc__,
"slk_attr_set($module, attr, pair=0, /)\n"
@@ -6346,9 +6346,9 @@ _curses_slk_attr_set(PyObject *module, PyObject *const
*args, Py_ssize_t nargs)
return return_value;
}
-#endif /* defined(HAVE_CURSES_SLK_ATTR_SET) */
+#endif /* defined(_Py_HAVE_CURSES_SLK_ATTR_SET) */
-#if defined(HAVE_CURSES_SLK_COLOR)
+#if defined(_Py_HAVE_CURSES_SLK_COLOR)
PyDoc_STRVAR(_curses_slk_color__doc__,
"slk_color($module, pair, /)\n"
@@ -6377,7 +6377,7 @@ _curses_slk_color(PyObject *module, PyObject *arg)
return return_value;
}
-#endif /* defined(HAVE_CURSES_SLK_COLOR) */
+#endif /* defined(_Py_HAVE_CURSES_SLK_COLOR) */
#if defined(HAVE_CURSES_USE_ENV)
@@ -6715,4 +6715,4 @@ _curses_has_extended_color_support(PyObject *module,
PyObject *Py_UNUSED(ignored
#ifndef _CURSES_ASSUME_DEFAULT_COLORS_METHODDEF
#define _CURSES_ASSUME_DEFAULT_COLORS_METHODDEF
#endif /* !defined(_CURSES_ASSUME_DEFAULT_COLORS_METHODDEF) */
-/*[clinic end generated code: output=422461e62cb86010 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=417ad397dfaa96ce input=a9049054013a1b77]*/
diff --git a/Tools/build/check_capi_macros_ignored.txt
b/Tools/build/check_capi_macros_ignored.txt
index dfde88c0c800d6..154f1dbfca039c 100644
--- a/Tools/build/check_capi_macros_ignored.txt
+++ b/Tools/build/check_capi_macros_ignored.txt
@@ -116,45 +116,23 @@ HAVE_CONNECT
HAVE_COPY_FILE_RANGE
HAVE_CTERMID
HAVE_CTERMID_R
-HAVE_CURSES_DEFINE_KEY
HAVE_CURSES_ESCDELAY
HAVE_CURSES_FILTER
HAVE_CURSES_GETMOUSE
HAVE_CURSES_H
HAVE_CURSES_HAS_KEY
-HAVE_CURSES_HAS_MOUSE
HAVE_CURSES_IMMEDOK
-HAVE_CURSES_IS_KEYPAD
-HAVE_CURSES_IS_LEAVEOK
HAVE_CURSES_IS_PAD
HAVE_CURSES_IS_TERM_RESIZED
-HAVE_CURSES_KEYOK
-HAVE_CURSES_KEY_DEFINED
-HAVE_CURSES_NEW_PRESCR
-HAVE_CURSES_NOFILTER
HAVE_CURSES_RESIZETERM
HAVE_CURSES_RESIZE_TERM
-HAVE_CURSES_SCR_DUMP
-HAVE_CURSES_SCR_SET
HAVE_CURSES_SET_ESCDELAY
HAVE_CURSES_SET_TABSIZE
-HAVE_CURSES_SLK_ATTR_OFF
-HAVE_CURSES_SLK_ATTR_ON
-HAVE_CURSES_SLK_ATTR_SET
-HAVE_CURSES_SLK_COLOR
HAVE_CURSES_SYNCOK
HAVE_CURSES_TABSIZE
-HAVE_CURSES_TERM_ATTRS
HAVE_CURSES_TYPEAHEAD
HAVE_CURSES_USE_ENV
-HAVE_CURSES_USE_SCREEN
-HAVE_CURSES_USE_WINDOW
-HAVE_CURSES_WATTR_GET
-HAVE_CURSES_WATTR_OFF
-HAVE_CURSES_WATTR_ON
-HAVE_CURSES_WATTR_SET
HAVE_CURSES_WCHGAT
-HAVE_CURSES_WCOLOR_SET
HAVE_DB_H
HAVE_DECLSPEC_DLL
HAVE_DECL_PR_SET_VMA_ANON_NAME
diff --git a/configure b/configure
index 655558774c4b5f..0e93826d3494c6 100755
--- a/configure
+++ b/configure
@@ -32277,6 +32277,9 @@ fi
+
+
+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for curses function
is_pad" >&5
printf %s "checking for curses function is_pad... " >&6; }
if test ${ac_cv_lib_curses_is_pad+y}
@@ -32338,6 +32341,7 @@ fi
+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for curses function
is_term_resized" >&5
printf %s "checking for curses function is_term_resized... " >&6; }
if test ${ac_cv_lib_curses_is_term_resized+y}
@@ -32399,6 +32403,7 @@ fi
+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for curses function
resize_term" >&5
printf %s "checking for curses function resize_term... " >&6; }
if test ${ac_cv_lib_curses_resize_term+y}
@@ -32460,6 +32465,7 @@ fi
+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for curses function
resizeterm" >&5
printf %s "checking for curses function resizeterm... " >&6; }
if test ${ac_cv_lib_curses_resizeterm+y}
@@ -32521,6 +32527,7 @@ fi
+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for curses function
immedok" >&5
printf %s "checking for curses function immedok... " >&6; }
if test ${ac_cv_lib_curses_immedok+y}
@@ -32582,6 +32589,7 @@ fi
+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for curses function
syncok" >&5
printf %s "checking for curses function syncok... " >&6; }
if test ${ac_cv_lib_curses_syncok+y}
@@ -32643,6 +32651,7 @@ fi
+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for curses function
wchgat" >&5
printf %s "checking for curses function wchgat... " >&6; }
if test ${ac_cv_lib_curses_wchgat+y}
@@ -32704,6 +32713,7 @@ fi
+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for curses function
filter" >&5
printf %s "checking for curses function filter... " >&6; }
if test ${ac_cv_lib_curses_filter+y}
@@ -32765,9 +32775,10 @@ fi
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for curses function
nofilter" >&5
-printf %s "checking for curses function nofilter... " >&6; }
-if test ${ac_cv_lib_curses_nofilter+y}
+
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for curses function
has_key" >&5
+printf %s "checking for curses function has_key... " >&6; }
+if test ${ac_cv_lib_curses_has_key+y}
then :
printf %s "(cached) " >&6
else case e in #(
@@ -32793,8 +32804,8 @@ int
main (void)
{
- #ifndef nofilter
- void * volatile x = (void *)nofilter; (void)x;
+ #ifndef has_key
+ void * volatile x = (void *)has_key; (void)x;
#endif
;
@@ -32803,9 +32814,9 @@ main (void)
_ACEOF
if ac_fn_c_try_link "$LINENO"
then :
- ac_cv_lib_curses_nofilter=yes
+ ac_cv_lib_curses_has_key=yes
else case e in #(
- e) ac_cv_lib_curses_nofilter=no ;;
+ e) ac_cv_lib_curses_has_key=no ;;
esac
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam \
@@ -32813,12 +32824,12 @@ rm -f core conftest.err conftest.$ac_objext
conftest.beam \
;;
esac
fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_lib_curses_nofilter" >&5
-printf "%s\n" "$ac_cv_lib_curses_nofilter" >&6; }
- if test "x$ac_cv_lib_curses_nofilter" = xyes
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_lib_curses_has_key" >&5
+printf "%s\n" "$ac_cv_lib_curses_has_key" >&6; }
+ if test "x$ac_cv_lib_curses_has_key" = xyes
then :
-printf "%s\n" "#define HAVE_CURSES_NOFILTER 1" >>confdefs.h
+printf "%s\n" "#define HAVE_CURSES_HAS_KEY 1" >>confdefs.h
fi
@@ -32826,9 +32837,10 @@ fi
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for curses function
has_key" >&5
-printf %s "checking for curses function has_key... " >&6; }
-if test ${ac_cv_lib_curses_has_key+y}
+
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for curses function
typeahead" >&5
+printf %s "checking for curses function typeahead... " >&6; }
+if test ${ac_cv_lib_curses_typeahead+y}
then :
printf %s "(cached) " >&6
else case e in #(
@@ -32854,8 +32866,8 @@ int
main (void)
{
- #ifndef has_key
- void * volatile x = (void *)has_key; (void)x;
+ #ifndef typeahead
+ void * volatile x = (void *)typeahead; (void)x;
#endif
;
@@ -32864,9 +32876,9 @@ main (void)
_ACEOF
if ac_fn_c_try_link "$LINENO"
then :
- ac_cv_lib_curses_has_key=yes
+ ac_cv_lib_curses_typeahead=yes
else case e in #(
- e) ac_cv_lib_curses_has_key=no ;;
+ e) ac_cv_lib_curses_typeahead=no ;;
esac
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam \
@@ -32874,12 +32886,12 @@ rm -f core conftest.err conftest.$ac_objext
conftest.beam \
;;
esac
fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_lib_curses_has_key" >&5
-printf "%s\n" "$ac_cv_lib_curses_has_key" >&6; }
- if test "x$ac_cv_lib_curses_has_key" = xyes
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_lib_curses_typeahead" >&5
+printf "%s\n" "$ac_cv_lib_curses_typeahead" >&6; }
+ if test "x$ac_cv_lib_curses_typeahead" = xyes
then :
-printf "%s\n" "#define HAVE_CURSES_HAS_KEY 1" >>confdefs.h
+printf "%s\n" "#define HAVE_CURSES_TYPEAHEAD 1" >>confdefs.h
fi
@@ -32887,9 +32899,10 @@ fi
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for curses function
has_mouse" >&5
-printf %s "checking for curses function has_mouse... " >&6; }
-if test ${ac_cv_lib_curses_has_mouse+y}
+
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for curses function
use_env" >&5
+printf %s "checking for curses function use_env... " >&6; }
+if test ${ac_cv_lib_curses_use_env+y}
then :
printf %s "(cached) " >&6
else case e in #(
@@ -32915,8 +32928,8 @@ int
main (void)
{
- #ifndef has_mouse
- void * volatile x = (void *)has_mouse; (void)x;
+ #ifndef use_env
+ void * volatile x = (void *)use_env; (void)x;
#endif
;
@@ -32925,9 +32938,9 @@ main (void)
_ACEOF
if ac_fn_c_try_link "$LINENO"
then :
- ac_cv_lib_curses_has_mouse=yes
+ ac_cv_lib_curses_use_env=yes
else case e in #(
- e) ac_cv_lib_curses_has_mouse=no ;;
+ e) ac_cv_lib_curses_use_env=no ;;
esac
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam \
@@ -32935,12 +32948,12 @@ rm -f core conftest.err conftest.$ac_objext
conftest.beam \
;;
esac
fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_lib_curses_has_mouse" >&5
-printf "%s\n" "$ac_cv_lib_curses_has_mouse" >&6; }
- if test "x$ac_cv_lib_curses_has_mouse" = xyes
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_lib_curses_use_env" >&5
+printf "%s\n" "$ac_cv_lib_curses_use_env" >&6; }
+ if test "x$ac_cv_lib_curses_use_env" = xyes
then :
-printf "%s\n" "#define HAVE_CURSES_HAS_MOUSE 1" >>confdefs.h
+printf "%s\n" "#define HAVE_CURSES_USE_ENV 1" >>confdefs.h
fi
@@ -32948,9 +32961,10 @@ fi
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for curses function
is_keypad" >&5
-printf %s "checking for curses function is_keypad... " >&6; }
-if test ${ac_cv_lib_curses_is_keypad+y}
+
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for curses function
set_escdelay" >&5
+printf %s "checking for curses function set_escdelay... " >&6; }
+if test ${ac_cv_lib_curses_set_escdelay+y}
then :
printf %s "(cached) " >&6
else case e in #(
@@ -32976,8 +32990,8 @@ int
main (void)
{
- #ifndef is_keypad
- void * volatile x = (void *)is_keypad; (void)x;
+ #ifndef set_escdelay
+ void * volatile x = (void *)set_escdelay; (void)x;
#endif
;
@@ -32986,9 +33000,9 @@ main (void)
_ACEOF
if ac_fn_c_try_link "$LINENO"
then :
- ac_cv_lib_curses_is_keypad=yes
+ ac_cv_lib_curses_set_escdelay=yes
else case e in #(
- e) ac_cv_lib_curses_is_keypad=no ;;
+ e) ac_cv_lib_curses_set_escdelay=no ;;
esac
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam \
@@ -32996,12 +33010,12 @@ rm -f core conftest.err conftest.$ac_objext
conftest.beam \
;;
esac
fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_lib_curses_is_keypad" >&5
-printf "%s\n" "$ac_cv_lib_curses_is_keypad" >&6; }
- if test "x$ac_cv_lib_curses_is_keypad" = xyes
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_lib_curses_set_escdelay" >&5
+printf "%s\n" "$ac_cv_lib_curses_set_escdelay" >&6; }
+ if test "x$ac_cv_lib_curses_set_escdelay" = xyes
then :
-printf "%s\n" "#define HAVE_CURSES_IS_KEYPAD 1" >>confdefs.h
+printf "%s\n" "#define HAVE_CURSES_SET_ESCDELAY 1" >>confdefs.h
fi
@@ -33009,9 +33023,10 @@ fi
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for curses function
is_leaveok" >&5
-printf %s "checking for curses function is_leaveok... " >&6; }
-if test ${ac_cv_lib_curses_is_leaveok+y}
+
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for curses function
set_tabsize" >&5
+printf %s "checking for curses function set_tabsize... " >&6; }
+if test ${ac_cv_lib_curses_set_tabsize+y}
then :
printf %s "(cached) " >&6
else case e in #(
@@ -33037,8 +33052,8 @@ int
main (void)
{
- #ifndef is_leaveok
- void * volatile x = (void *)is_leaveok; (void)x;
+ #ifndef set_tabsize
+ void * volatile x = (void *)set_tabsize; (void)x;
#endif
;
@@ -33047,9 +33062,9 @@ main (void)
_ACEOF
if ac_fn_c_try_link "$LINENO"
then :
- ac_cv_lib_curses_is_leaveok=yes
+ ac_cv_lib_curses_set_tabsize=yes
else case e in #(
- e) ac_cv_lib_curses_is_leaveok=no ;;
+ e) ac_cv_lib_curses_set_tabsize=no ;;
esac
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam \
@@ -33057,12 +33072,12 @@ rm -f core conftest.err conftest.$ac_objext
conftest.beam \
;;
esac
fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_lib_curses_is_leaveok" >&5
-printf "%s\n" "$ac_cv_lib_curses_is_leaveok" >&6; }
- if test "x$ac_cv_lib_curses_is_leaveok" = xyes
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_lib_curses_set_tabsize" >&5
+printf "%s\n" "$ac_cv_lib_curses_set_tabsize" >&6; }
+ if test "x$ac_cv_lib_curses_set_tabsize" = xyes
then :
-printf "%s\n" "#define HAVE_CURSES_IS_LEAVEOK 1" >>confdefs.h
+printf "%s\n" "#define HAVE_CURSES_SET_TABSIZE 1" >>confdefs.h
fi
@@ -33070,9 +33085,9 @@ fi
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for curses function
typeahead" >&5
-printf %s "checking for curses function typeahead... " >&6; }
-if test ${ac_cv_lib_curses_typeahead+y}
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for curses variable
ESCDELAY" >&5
+printf %s "checking for curses variable ESCDELAY... " >&6; }
+if test ${ac_cv_lib_curses_ESCDELAY+y}
then :
printf %s "(cached) " >&6
else case e in #(
@@ -33098,32 +33113,29 @@ int
main (void)
{
- #ifndef typeahead
- void * volatile x = (void *)typeahead; (void)x;
- #endif
+ int x = ESCDELAY; (void)x;
;
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"
+if ac_fn_c_try_compile "$LINENO"
then :
- ac_cv_lib_curses_typeahead=yes
+ ac_cv_lib_curses_ESCDELAY=yes
else case e in #(
- e) ac_cv_lib_curses_typeahead=no ;;
+ e) ac_cv_lib_curses_ESCDELAY=no ;;
esac
fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
;;
esac
fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_lib_curses_typeahead" >&5
-printf "%s\n" "$ac_cv_lib_curses_typeahead" >&6; }
- if test "x$ac_cv_lib_curses_typeahead" = xyes
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_lib_curses_ESCDELAY" >&5
+printf "%s\n" "$ac_cv_lib_curses_ESCDELAY" >&6; }
+ if test "x$ac_cv_lib_curses_ESCDELAY" = xyes
then :
-printf "%s\n" "#define HAVE_CURSES_TYPEAHEAD 1" >>confdefs.h
+printf "%s\n" "#define HAVE_CURSES_ESCDELAY 1" >>confdefs.h
fi
@@ -33131,9 +33143,9 @@ fi
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for curses function
use_env" >&5
-printf %s "checking for curses function use_env... " >&6; }
-if test ${ac_cv_lib_curses_use_env+y}
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for curses variable
TABSIZE" >&5
+printf %s "checking for curses variable TABSIZE... " >&6; }
+if test ${ac_cv_lib_curses_TABSIZE+y}
then :
printf %s "(cached) " >&6
else case e in #(
@@ -33159,32 +33171,29 @@ int
main (void)
{
- #ifndef use_env
- void * volatile x = (void *)use_env; (void)x;
- #endif
+ int x = TABSIZE; (void)x;
;
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"
+if ac_fn_c_try_compile "$LINENO"
then :
- ac_cv_lib_curses_use_env=yes
+ ac_cv_lib_curses_TABSIZE=yes
else case e in #(
- e) ac_cv_lib_curses_use_env=no ;;
+ e) ac_cv_lib_curses_TABSIZE=no ;;
esac
fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
;;
esac
fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_lib_curses_use_env" >&5
-printf "%s\n" "$ac_cv_lib_curses_use_env" >&6; }
- if test "x$ac_cv_lib_curses_use_env" = xyes
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_lib_curses_TABSIZE" >&5
+printf "%s\n" "$ac_cv_lib_curses_TABSIZE" >&6; }
+ if test "x$ac_cv_lib_curses_TABSIZE" = xyes
then :
-printf "%s\n" "#define HAVE_CURSES_USE_ENV 1" >>confdefs.h
+printf "%s\n" "#define HAVE_CURSES_TABSIZE 1" >>confdefs.h
fi
@@ -33192,9 +33201,11 @@ fi
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for curses function
new_prescr" >&5
-printf %s "checking for curses function new_prescr... " >&6; }
-if test ${ac_cv_lib_curses_new_prescr+y}
+
+
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for curses function
define_key" >&5
+printf %s "checking for curses function define_key... " >&6; }
+if test ${ac_cv_lib_curses_define_key+y}
then :
printf %s "(cached) " >&6
else case e in #(
@@ -33220,8 +33231,8 @@ int
main (void)
{
- #ifndef new_prescr
- void * volatile x = (void *)new_prescr; (void)x;
+ #ifndef define_key
+ void * volatile x = (void *)define_key; (void)x;
#endif
;
@@ -33230,9 +33241,9 @@ main (void)
_ACEOF
if ac_fn_c_try_link "$LINENO"
then :
- ac_cv_lib_curses_new_prescr=yes
+ ac_cv_lib_curses_define_key=yes
else case e in #(
- e) ac_cv_lib_curses_new_prescr=no ;;
+ e) ac_cv_lib_curses_define_key=no ;;
esac
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam \
@@ -33240,12 +33251,12 @@ rm -f core conftest.err conftest.$ac_objext
conftest.beam \
;;
esac
fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_lib_curses_new_prescr" >&5
-printf "%s\n" "$ac_cv_lib_curses_new_prescr" >&6; }
- if test "x$ac_cv_lib_curses_new_prescr" = xyes
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_lib_curses_define_key" >&5
+printf "%s\n" "$ac_cv_lib_curses_define_key" >&6; }
+ if test "x$ac_cv_lib_curses_define_key" = xyes
then :
-printf "%s\n" "#define HAVE_CURSES_NEW_PRESCR 1" >>confdefs.h
+printf "%s\n" "#define _Py_HAVE_CURSES_DEFINE_KEY 1" >>confdefs.h
fi
@@ -33253,9 +33264,11 @@ fi
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for curses function
use_screen" >&5
-printf %s "checking for curses function use_screen... " >&6; }
-if test ${ac_cv_lib_curses_use_screen+y}
+
+
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for curses function
has_mouse" >&5
+printf %s "checking for curses function has_mouse... " >&6; }
+if test ${ac_cv_lib_curses_has_mouse+y}
then :
printf %s "(cached) " >&6
else case e in #(
@@ -33281,8 +33294,8 @@ int
main (void)
{
- #ifndef use_screen
- void * volatile x = (void *)use_screen; (void)x;
+ #ifndef has_mouse
+ void * volatile x = (void *)has_mouse; (void)x;
#endif
;
@@ -33291,9 +33304,9 @@ main (void)
_ACEOF
if ac_fn_c_try_link "$LINENO"
then :
- ac_cv_lib_curses_use_screen=yes
+ ac_cv_lib_curses_has_mouse=yes
else case e in #(
- e) ac_cv_lib_curses_use_screen=no ;;
+ e) ac_cv_lib_curses_has_mouse=no ;;
esac
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam \
@@ -33301,12 +33314,12 @@ rm -f core conftest.err conftest.$ac_objext
conftest.beam \
;;
esac
fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_lib_curses_use_screen" >&5
-printf "%s\n" "$ac_cv_lib_curses_use_screen" >&6; }
- if test "x$ac_cv_lib_curses_use_screen" = xyes
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_lib_curses_has_mouse" >&5
+printf "%s\n" "$ac_cv_lib_curses_has_mouse" >&6; }
+ if test "x$ac_cv_lib_curses_has_mouse" = xyes
then :
-printf "%s\n" "#define HAVE_CURSES_USE_SCREEN 1" >>confdefs.h
+printf "%s\n" "#define _Py_HAVE_CURSES_HAS_MOUSE 1" >>confdefs.h
fi
@@ -33314,9 +33327,11 @@ fi
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for curses function
use_window" >&5
-printf %s "checking for curses function use_window... " >&6; }
-if test ${ac_cv_lib_curses_use_window+y}
+
+
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for curses function
is_keypad" >&5
+printf %s "checking for curses function is_keypad... " >&6; }
+if test ${ac_cv_lib_curses_is_keypad+y}
then :
printf %s "(cached) " >&6
else case e in #(
@@ -33342,8 +33357,8 @@ int
main (void)
{
- #ifndef use_window
- void * volatile x = (void *)use_window; (void)x;
+ #ifndef is_keypad
+ void * volatile x = (void *)is_keypad; (void)x;
#endif
;
@@ -33352,9 +33367,9 @@ main (void)
_ACEOF
if ac_fn_c_try_link "$LINENO"
then :
- ac_cv_lib_curses_use_window=yes
+ ac_cv_lib_curses_is_keypad=yes
else case e in #(
- e) ac_cv_lib_curses_use_window=no ;;
+ e) ac_cv_lib_curses_is_keypad=no ;;
esac
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam \
@@ -33362,12 +33377,12 @@ rm -f core conftest.err conftest.$ac_objext
conftest.beam \
;;
esac
fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_lib_curses_use_window" >&5
-printf "%s\n" "$ac_cv_lib_curses_use_window" >&6; }
- if test "x$ac_cv_lib_curses_use_window" = xyes
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_lib_curses_is_keypad" >&5
+printf "%s\n" "$ac_cv_lib_curses_is_keypad" >&6; }
+ if test "x$ac_cv_lib_curses_is_keypad" = xyes
then :
-printf "%s\n" "#define HAVE_CURSES_USE_WINDOW 1" >>confdefs.h
+printf "%s\n" "#define _Py_HAVE_CURSES_IS_KEYPAD 1" >>confdefs.h
fi
@@ -33375,9 +33390,11 @@ fi
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for curses function
key_defined" >&5
-printf %s "checking for curses function key_defined... " >&6; }
-if test ${ac_cv_lib_curses_key_defined+y}
+
+
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for curses function
is_leaveok" >&5
+printf %s "checking for curses function is_leaveok... " >&6; }
+if test ${ac_cv_lib_curses_is_leaveok+y}
then :
printf %s "(cached) " >&6
else case e in #(
@@ -33403,8 +33420,8 @@ int
main (void)
{
- #ifndef key_defined
- void * volatile x = (void *)key_defined; (void)x;
+ #ifndef is_leaveok
+ void * volatile x = (void *)is_leaveok; (void)x;
#endif
;
@@ -33413,9 +33430,9 @@ main (void)
_ACEOF
if ac_fn_c_try_link "$LINENO"
then :
- ac_cv_lib_curses_key_defined=yes
+ ac_cv_lib_curses_is_leaveok=yes
else case e in #(
- e) ac_cv_lib_curses_key_defined=no ;;
+ e) ac_cv_lib_curses_is_leaveok=no ;;
esac
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam \
@@ -33423,12 +33440,12 @@ rm -f core conftest.err conftest.$ac_objext
conftest.beam \
;;
esac
fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_lib_curses_key_defined" >&5
-printf "%s\n" "$ac_cv_lib_curses_key_defined" >&6; }
- if test "x$ac_cv_lib_curses_key_defined" = xyes
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_lib_curses_is_leaveok" >&5
+printf "%s\n" "$ac_cv_lib_curses_is_leaveok" >&6; }
+ if test "x$ac_cv_lib_curses_is_leaveok" = xyes
then :
-printf "%s\n" "#define HAVE_CURSES_KEY_DEFINED 1" >>confdefs.h
+printf "%s\n" "#define _Py_HAVE_CURSES_IS_LEAVEOK 1" >>confdefs.h
fi
@@ -33436,9 +33453,11 @@ fi
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for curses function
term_attrs" >&5
-printf %s "checking for curses function term_attrs... " >&6; }
-if test ${ac_cv_lib_curses_term_attrs+y}
+
+
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for curses function
key_defined" >&5
+printf %s "checking for curses function key_defined... " >&6; }
+if test ${ac_cv_lib_curses_key_defined+y}
then :
printf %s "(cached) " >&6
else case e in #(
@@ -33464,8 +33483,8 @@ int
main (void)
{
- #ifndef term_attrs
- void * volatile x = (void *)term_attrs; (void)x;
+ #ifndef key_defined
+ void * volatile x = (void *)key_defined; (void)x;
#endif
;
@@ -33474,9 +33493,9 @@ main (void)
_ACEOF
if ac_fn_c_try_link "$LINENO"
then :
- ac_cv_lib_curses_term_attrs=yes
+ ac_cv_lib_curses_key_defined=yes
else case e in #(
- e) ac_cv_lib_curses_term_attrs=no ;;
+ e) ac_cv_lib_curses_key_defined=no ;;
esac
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam \
@@ -33484,12 +33503,12 @@ rm -f core conftest.err conftest.$ac_objext
conftest.beam \
;;
esac
fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_lib_curses_term_attrs" >&5
-printf "%s\n" "$ac_cv_lib_curses_term_attrs" >&6; }
- if test "x$ac_cv_lib_curses_term_attrs" = xyes
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_lib_curses_key_defined" >&5
+printf "%s\n" "$ac_cv_lib_curses_key_defined" >&6; }
+ if test "x$ac_cv_lib_curses_key_defined" = xyes
then :
-printf "%s\n" "#define HAVE_CURSES_TERM_ATTRS 1" >>confdefs.h
+printf "%s\n" "#define _Py_HAVE_CURSES_KEY_DEFINED 1" >>confdefs.h
fi
@@ -33497,9 +33516,11 @@ fi
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for curses function
define_key" >&5
-printf %s "checking for curses function define_key... " >&6; }
-if test ${ac_cv_lib_curses_define_key+y}
+
+
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for curses function
keyok" >&5
+printf %s "checking for curses function keyok... " >&6; }
+if test ${ac_cv_lib_curses_keyok+y}
then :
printf %s "(cached) " >&6
else case e in #(
@@ -33525,8 +33546,8 @@ int
main (void)
{
- #ifndef define_key
- void * volatile x = (void *)define_key; (void)x;
+ #ifndef keyok
+ void * volatile x = (void *)keyok; (void)x;
#endif
;
@@ -33535,9 +33556,9 @@ main (void)
_ACEOF
if ac_fn_c_try_link "$LINENO"
then :
- ac_cv_lib_curses_define_key=yes
+ ac_cv_lib_curses_keyok=yes
else case e in #(
- e) ac_cv_lib_curses_define_key=no ;;
+ e) ac_cv_lib_curses_keyok=no ;;
esac
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam \
@@ -33545,12 +33566,12 @@ rm -f core conftest.err conftest.$ac_objext
conftest.beam \
;;
esac
fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_lib_curses_define_key" >&5
-printf "%s\n" "$ac_cv_lib_curses_define_key" >&6; }
- if test "x$ac_cv_lib_curses_define_key" = xyes
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_curses_keyok"
>&5
+printf "%s\n" "$ac_cv_lib_curses_keyok" >&6; }
+ if test "x$ac_cv_lib_curses_keyok" = xyes
then :
-printf "%s\n" "#define HAVE_CURSES_DEFINE_KEY 1" >>confdefs.h
+printf "%s\n" "#define _Py_HAVE_CURSES_KEYOK 1" >>confdefs.h
fi
@@ -33558,9 +33579,11 @@ fi
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for curses function
keyok" >&5
-printf %s "checking for curses function keyok... " >&6; }
-if test ${ac_cv_lib_curses_keyok+y}
+
+
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for curses function
new_prescr" >&5
+printf %s "checking for curses function new_prescr... " >&6; }
+if test ${ac_cv_lib_curses_new_prescr+y}
then :
printf %s "(cached) " >&6
else case e in #(
@@ -33586,8 +33609,8 @@ int
main (void)
{
- #ifndef keyok
- void * volatile x = (void *)keyok; (void)x;
+ #ifndef new_prescr
+ void * volatile x = (void *)new_prescr; (void)x;
#endif
;
@@ -33596,9 +33619,9 @@ main (void)
_ACEOF
if ac_fn_c_try_link "$LINENO"
then :
- ac_cv_lib_curses_keyok=yes
+ ac_cv_lib_curses_new_prescr=yes
else case e in #(
- e) ac_cv_lib_curses_keyok=no ;;
+ e) ac_cv_lib_curses_new_prescr=no ;;
esac
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam \
@@ -33606,12 +33629,12 @@ rm -f core conftest.err conftest.$ac_objext
conftest.beam \
;;
esac
fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_curses_keyok"
>&5
-printf "%s\n" "$ac_cv_lib_curses_keyok" >&6; }
- if test "x$ac_cv_lib_curses_keyok" = xyes
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_lib_curses_new_prescr" >&5
+printf "%s\n" "$ac_cv_lib_curses_new_prescr" >&6; }
+ if test "x$ac_cv_lib_curses_new_prescr" = xyes
then :
-printf "%s\n" "#define HAVE_CURSES_KEYOK 1" >>confdefs.h
+printf "%s\n" "#define _Py_HAVE_CURSES_NEW_PRESCR 1" >>confdefs.h
fi
@@ -33619,9 +33642,11 @@ fi
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for curses function
set_escdelay" >&5
-printf %s "checking for curses function set_escdelay... " >&6; }
-if test ${ac_cv_lib_curses_set_escdelay+y}
+
+
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for curses function
nofilter" >&5
+printf %s "checking for curses function nofilter... " >&6; }
+if test ${ac_cv_lib_curses_nofilter+y}
then :
printf %s "(cached) " >&6
else case e in #(
@@ -33647,8 +33672,8 @@ int
main (void)
{
- #ifndef set_escdelay
- void * volatile x = (void *)set_escdelay; (void)x;
+ #ifndef nofilter
+ void * volatile x = (void *)nofilter; (void)x;
#endif
;
@@ -33657,9 +33682,9 @@ main (void)
_ACEOF
if ac_fn_c_try_link "$LINENO"
then :
- ac_cv_lib_curses_set_escdelay=yes
+ ac_cv_lib_curses_nofilter=yes
else case e in #(
- e) ac_cv_lib_curses_set_escdelay=no ;;
+ e) ac_cv_lib_curses_nofilter=no ;;
esac
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam \
@@ -33667,12 +33692,12 @@ rm -f core conftest.err conftest.$ac_objext
conftest.beam \
;;
esac
fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_lib_curses_set_escdelay" >&5
-printf "%s\n" "$ac_cv_lib_curses_set_escdelay" >&6; }
- if test "x$ac_cv_lib_curses_set_escdelay" = xyes
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_lib_curses_nofilter" >&5
+printf "%s\n" "$ac_cv_lib_curses_nofilter" >&6; }
+ if test "x$ac_cv_lib_curses_nofilter" = xyes
then :
-printf "%s\n" "#define HAVE_CURSES_SET_ESCDELAY 1" >>confdefs.h
+printf "%s\n" "#define _Py_HAVE_CURSES_NOFILTER 1" >>confdefs.h
fi
@@ -33680,9 +33705,11 @@ fi
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for curses function
set_tabsize" >&5
-printf %s "checking for curses function set_tabsize... " >&6; }
-if test ${ac_cv_lib_curses_set_tabsize+y}
+
+
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for curses function
slk_attr_off" >&5
+printf %s "checking for curses function slk_attr_off... " >&6; }
+if test ${ac_cv_lib_curses_slk_attr_off+y}
then :
printf %s "(cached) " >&6
else case e in #(
@@ -33708,8 +33735,8 @@ int
main (void)
{
- #ifndef set_tabsize
- void * volatile x = (void *)set_tabsize; (void)x;
+ #ifndef slk_attr_off
+ void * volatile x = (void *)slk_attr_off; (void)x;
#endif
;
@@ -33718,9 +33745,9 @@ main (void)
_ACEOF
if ac_fn_c_try_link "$LINENO"
then :
- ac_cv_lib_curses_set_tabsize=yes
+ ac_cv_lib_curses_slk_attr_off=yes
else case e in #(
- e) ac_cv_lib_curses_set_tabsize=no ;;
+ e) ac_cv_lib_curses_slk_attr_off=no ;;
esac
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam \
@@ -33728,12 +33755,12 @@ rm -f core conftest.err conftest.$ac_objext
conftest.beam \
;;
esac
fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_lib_curses_set_tabsize" >&5
-printf "%s\n" "$ac_cv_lib_curses_set_tabsize" >&6; }
- if test "x$ac_cv_lib_curses_set_tabsize" = xyes
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_lib_curses_slk_attr_off" >&5
+printf "%s\n" "$ac_cv_lib_curses_slk_attr_off" >&6; }
+ if test "x$ac_cv_lib_curses_slk_attr_off" = xyes
then :
-printf "%s\n" "#define HAVE_CURSES_SET_TABSIZE 1" >>confdefs.h
+printf "%s\n" "#define _Py_HAVE_CURSES_SLK_ATTR_OFF 1" >>confdefs.h
fi
@@ -33741,9 +33768,11 @@ fi
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for curses function
wattr_get" >&5
-printf %s "checking for curses function wattr_get... " >&6; }
-if test ${ac_cv_lib_curses_wattr_get+y}
+
+
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for curses function
slk_attr_on" >&5
+printf %s "checking for curses function slk_attr_on... " >&6; }
+if test ${ac_cv_lib_curses_slk_attr_on+y}
then :
printf %s "(cached) " >&6
else case e in #(
@@ -33769,8 +33798,8 @@ int
main (void)
{
- #ifndef wattr_get
- void * volatile x = (void *)wattr_get; (void)x;
+ #ifndef slk_attr_on
+ void * volatile x = (void *)slk_attr_on; (void)x;
#endif
;
@@ -33779,9 +33808,9 @@ main (void)
_ACEOF
if ac_fn_c_try_link "$LINENO"
then :
- ac_cv_lib_curses_wattr_get=yes
+ ac_cv_lib_curses_slk_attr_on=yes
else case e in #(
- e) ac_cv_lib_curses_wattr_get=no ;;
+ e) ac_cv_lib_curses_slk_attr_on=no ;;
esac
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam \
@@ -33789,12 +33818,12 @@ rm -f core conftest.err conftest.$ac_objext
conftest.beam \
;;
esac
fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_lib_curses_wattr_get" >&5
-printf "%s\n" "$ac_cv_lib_curses_wattr_get" >&6; }
- if test "x$ac_cv_lib_curses_wattr_get" = xyes
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_lib_curses_slk_attr_on" >&5
+printf "%s\n" "$ac_cv_lib_curses_slk_attr_on" >&6; }
+ if test "x$ac_cv_lib_curses_slk_attr_on" = xyes
then :
-printf "%s\n" "#define HAVE_CURSES_WATTR_GET 1" >>confdefs.h
+printf "%s\n" "#define _Py_HAVE_CURSES_SLK_ATTR_ON 1" >>confdefs.h
fi
@@ -33802,9 +33831,11 @@ fi
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for curses function
wattr_set" >&5
-printf %s "checking for curses function wattr_set... " >&6; }
-if test ${ac_cv_lib_curses_wattr_set+y}
+
+
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for curses function
slk_attr_set" >&5
+printf %s "checking for curses function slk_attr_set... " >&6; }
+if test ${ac_cv_lib_curses_slk_attr_set+y}
then :
printf %s "(cached) " >&6
else case e in #(
@@ -33830,8 +33861,8 @@ int
main (void)
{
- #ifndef wattr_set
- void * volatile x = (void *)wattr_set; (void)x;
+ #ifndef slk_attr_set
+ void * volatile x = (void *)slk_attr_set; (void)x;
#endif
;
@@ -33840,9 +33871,9 @@ main (void)
_ACEOF
if ac_fn_c_try_link "$LINENO"
then :
- ac_cv_lib_curses_wattr_set=yes
+ ac_cv_lib_curses_slk_attr_set=yes
else case e in #(
- e) ac_cv_lib_curses_wattr_set=no ;;
+ e) ac_cv_lib_curses_slk_attr_set=no ;;
esac
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam \
@@ -33850,12 +33881,12 @@ rm -f core conftest.err conftest.$ac_objext
conftest.beam \
;;
esac
fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_lib_curses_wattr_set" >&5
-printf "%s\n" "$ac_cv_lib_curses_wattr_set" >&6; }
- if test "x$ac_cv_lib_curses_wattr_set" = xyes
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_lib_curses_slk_attr_set" >&5
+printf "%s\n" "$ac_cv_lib_curses_slk_attr_set" >&6; }
+ if test "x$ac_cv_lib_curses_slk_attr_set" = xyes
then :
-printf "%s\n" "#define HAVE_CURSES_WATTR_SET 1" >>confdefs.h
+printf "%s\n" "#define _Py_HAVE_CURSES_SLK_ATTR_SET 1" >>confdefs.h
fi
@@ -33863,9 +33894,11 @@ fi
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for curses function
wattr_on" >&5
-printf %s "checking for curses function wattr_on... " >&6; }
-if test ${ac_cv_lib_curses_wattr_on+y}
+
+
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for curses function
slk_color" >&5
+printf %s "checking for curses function slk_color... " >&6; }
+if test ${ac_cv_lib_curses_slk_color+y}
then :
printf %s "(cached) " >&6
else case e in #(
@@ -33891,8 +33924,8 @@ int
main (void)
{
- #ifndef wattr_on
- void * volatile x = (void *)wattr_on; (void)x;
+ #ifndef slk_color
+ void * volatile x = (void *)slk_color; (void)x;
#endif
;
@@ -33901,9 +33934,9 @@ main (void)
_ACEOF
if ac_fn_c_try_link "$LINENO"
then :
- ac_cv_lib_curses_wattr_on=yes
+ ac_cv_lib_curses_slk_color=yes
else case e in #(
- e) ac_cv_lib_curses_wattr_on=no ;;
+ e) ac_cv_lib_curses_slk_color=no ;;
esac
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam \
@@ -33911,12 +33944,12 @@ rm -f core conftest.err conftest.$ac_objext
conftest.beam \
;;
esac
fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_lib_curses_wattr_on" >&5
-printf "%s\n" "$ac_cv_lib_curses_wattr_on" >&6; }
- if test "x$ac_cv_lib_curses_wattr_on" = xyes
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_lib_curses_slk_color" >&5
+printf "%s\n" "$ac_cv_lib_curses_slk_color" >&6; }
+ if test "x$ac_cv_lib_curses_slk_color" = xyes
then :
-printf "%s\n" "#define HAVE_CURSES_WATTR_ON 1" >>confdefs.h
+printf "%s\n" "#define _Py_HAVE_CURSES_SLK_COLOR 1" >>confdefs.h
fi
@@ -33924,9 +33957,11 @@ fi
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for curses function
wattr_off" >&5
-printf %s "checking for curses function wattr_off... " >&6; }
-if test ${ac_cv_lib_curses_wattr_off+y}
+
+
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for curses function
term_attrs" >&5
+printf %s "checking for curses function term_attrs... " >&6; }
+if test ${ac_cv_lib_curses_term_attrs+y}
then :
printf %s "(cached) " >&6
else case e in #(
@@ -33952,8 +33987,8 @@ int
main (void)
{
- #ifndef wattr_off
- void * volatile x = (void *)wattr_off; (void)x;
+ #ifndef term_attrs
+ void * volatile x = (void *)term_attrs; (void)x;
#endif
;
@@ -33962,9 +33997,9 @@ main (void)
_ACEOF
if ac_fn_c_try_link "$LINENO"
then :
- ac_cv_lib_curses_wattr_off=yes
+ ac_cv_lib_curses_term_attrs=yes
else case e in #(
- e) ac_cv_lib_curses_wattr_off=no ;;
+ e) ac_cv_lib_curses_term_attrs=no ;;
esac
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam \
@@ -33972,12 +34007,12 @@ rm -f core conftest.err conftest.$ac_objext
conftest.beam \
;;
esac
fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_lib_curses_wattr_off" >&5
-printf "%s\n" "$ac_cv_lib_curses_wattr_off" >&6; }
- if test "x$ac_cv_lib_curses_wattr_off" = xyes
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_lib_curses_term_attrs" >&5
+printf "%s\n" "$ac_cv_lib_curses_term_attrs" >&6; }
+ if test "x$ac_cv_lib_curses_term_attrs" = xyes
then :
-printf "%s\n" "#define HAVE_CURSES_WATTR_OFF 1" >>confdefs.h
+printf "%s\n" "#define _Py_HAVE_CURSES_TERM_ATTRS 1" >>confdefs.h
fi
@@ -33985,9 +34020,11 @@ fi
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for curses function
wcolor_set" >&5
-printf %s "checking for curses function wcolor_set... " >&6; }
-if test ${ac_cv_lib_curses_wcolor_set+y}
+
+
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for curses function
use_screen" >&5
+printf %s "checking for curses function use_screen... " >&6; }
+if test ${ac_cv_lib_curses_use_screen+y}
then :
printf %s "(cached) " >&6
else case e in #(
@@ -34013,8 +34050,8 @@ int
main (void)
{
- #ifndef wcolor_set
- void * volatile x = (void *)wcolor_set; (void)x;
+ #ifndef use_screen
+ void * volatile x = (void *)use_screen; (void)x;
#endif
;
@@ -34023,9 +34060,9 @@ main (void)
_ACEOF
if ac_fn_c_try_link "$LINENO"
then :
- ac_cv_lib_curses_wcolor_set=yes
+ ac_cv_lib_curses_use_screen=yes
else case e in #(
- e) ac_cv_lib_curses_wcolor_set=no ;;
+ e) ac_cv_lib_curses_use_screen=no ;;
esac
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam \
@@ -34033,12 +34070,12 @@ rm -f core conftest.err conftest.$ac_objext
conftest.beam \
;;
esac
fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_lib_curses_wcolor_set" >&5
-printf "%s\n" "$ac_cv_lib_curses_wcolor_set" >&6; }
- if test "x$ac_cv_lib_curses_wcolor_set" = xyes
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_lib_curses_use_screen" >&5
+printf "%s\n" "$ac_cv_lib_curses_use_screen" >&6; }
+ if test "x$ac_cv_lib_curses_use_screen" = xyes
then :
-printf "%s\n" "#define HAVE_CURSES_WCOLOR_SET 1" >>confdefs.h
+printf "%s\n" "#define _Py_HAVE_CURSES_USE_SCREEN 1" >>confdefs.h
fi
@@ -34046,9 +34083,11 @@ fi
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for curses function
slk_attr_on" >&5
-printf %s "checking for curses function slk_attr_on... " >&6; }
-if test ${ac_cv_lib_curses_slk_attr_on+y}
+
+
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for curses function
use_window" >&5
+printf %s "checking for curses function use_window... " >&6; }
+if test ${ac_cv_lib_curses_use_window+y}
then :
printf %s "(cached) " >&6
else case e in #(
@@ -34074,8 +34113,8 @@ int
main (void)
{
- #ifndef slk_attr_on
- void * volatile x = (void *)slk_attr_on; (void)x;
+ #ifndef use_window
+ void * volatile x = (void *)use_window; (void)x;
#endif
;
@@ -34084,9 +34123,9 @@ main (void)
_ACEOF
if ac_fn_c_try_link "$LINENO"
then :
- ac_cv_lib_curses_slk_attr_on=yes
+ ac_cv_lib_curses_use_window=yes
else case e in #(
- e) ac_cv_lib_curses_slk_attr_on=no ;;
+ e) ac_cv_lib_curses_use_window=no ;;
esac
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam \
@@ -34094,12 +34133,12 @@ rm -f core conftest.err conftest.$ac_objext
conftest.beam \
;;
esac
fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_lib_curses_slk_attr_on" >&5
-printf "%s\n" "$ac_cv_lib_curses_slk_attr_on" >&6; }
- if test "x$ac_cv_lib_curses_slk_attr_on" = xyes
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_lib_curses_use_window" >&5
+printf "%s\n" "$ac_cv_lib_curses_use_window" >&6; }
+ if test "x$ac_cv_lib_curses_use_window" = xyes
then :
-printf "%s\n" "#define HAVE_CURSES_SLK_ATTR_ON 1" >>confdefs.h
+printf "%s\n" "#define _Py_HAVE_CURSES_USE_WINDOW 1" >>confdefs.h
fi
@@ -34107,9 +34146,11 @@ fi
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for curses function
slk_attr_off" >&5
-printf %s "checking for curses function slk_attr_off... " >&6; }
-if test ${ac_cv_lib_curses_slk_attr_off+y}
+
+
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for curses function
wattr_get" >&5
+printf %s "checking for curses function wattr_get... " >&6; }
+if test ${ac_cv_lib_curses_wattr_get+y}
then :
printf %s "(cached) " >&6
else case e in #(
@@ -34135,8 +34176,8 @@ int
main (void)
{
- #ifndef slk_attr_off
- void * volatile x = (void *)slk_attr_off; (void)x;
+ #ifndef wattr_get
+ void * volatile x = (void *)wattr_get; (void)x;
#endif
;
@@ -34145,9 +34186,9 @@ main (void)
_ACEOF
if ac_fn_c_try_link "$LINENO"
then :
- ac_cv_lib_curses_slk_attr_off=yes
+ ac_cv_lib_curses_wattr_get=yes
else case e in #(
- e) ac_cv_lib_curses_slk_attr_off=no ;;
+ e) ac_cv_lib_curses_wattr_get=no ;;
esac
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam \
@@ -34155,12 +34196,12 @@ rm -f core conftest.err conftest.$ac_objext
conftest.beam \
;;
esac
fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_lib_curses_slk_attr_off" >&5
-printf "%s\n" "$ac_cv_lib_curses_slk_attr_off" >&6; }
- if test "x$ac_cv_lib_curses_slk_attr_off" = xyes
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_lib_curses_wattr_get" >&5
+printf "%s\n" "$ac_cv_lib_curses_wattr_get" >&6; }
+ if test "x$ac_cv_lib_curses_wattr_get" = xyes
then :
-printf "%s\n" "#define HAVE_CURSES_SLK_ATTR_OFF 1" >>confdefs.h
+printf "%s\n" "#define _Py_HAVE_CURSES_WATTR_GET 1" >>confdefs.h
fi
@@ -34168,9 +34209,11 @@ fi
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for curses function
slk_attr_set" >&5
-printf %s "checking for curses function slk_attr_set... " >&6; }
-if test ${ac_cv_lib_curses_slk_attr_set+y}
+
+
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for curses function
wattr_off" >&5
+printf %s "checking for curses function wattr_off... " >&6; }
+if test ${ac_cv_lib_curses_wattr_off+y}
then :
printf %s "(cached) " >&6
else case e in #(
@@ -34196,8 +34239,8 @@ int
main (void)
{
- #ifndef slk_attr_set
- void * volatile x = (void *)slk_attr_set; (void)x;
+ #ifndef wattr_off
+ void * volatile x = (void *)wattr_off; (void)x;
#endif
;
@@ -34206,9 +34249,9 @@ main (void)
_ACEOF
if ac_fn_c_try_link "$LINENO"
then :
- ac_cv_lib_curses_slk_attr_set=yes
+ ac_cv_lib_curses_wattr_off=yes
else case e in #(
- e) ac_cv_lib_curses_slk_attr_set=no ;;
+ e) ac_cv_lib_curses_wattr_off=no ;;
esac
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam \
@@ -34216,12 +34259,12 @@ rm -f core conftest.err conftest.$ac_objext
conftest.beam \
;;
esac
fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_lib_curses_slk_attr_set" >&5
-printf "%s\n" "$ac_cv_lib_curses_slk_attr_set" >&6; }
- if test "x$ac_cv_lib_curses_slk_attr_set" = xyes
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_lib_curses_wattr_off" >&5
+printf "%s\n" "$ac_cv_lib_curses_wattr_off" >&6; }
+ if test "x$ac_cv_lib_curses_wattr_off" = xyes
then :
-printf "%s\n" "#define HAVE_CURSES_SLK_ATTR_SET 1" >>confdefs.h
+printf "%s\n" "#define _Py_HAVE_CURSES_WATTR_OFF 1" >>confdefs.h
fi
@@ -34229,9 +34272,11 @@ fi
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for curses function
slk_color" >&5
-printf %s "checking for curses function slk_color... " >&6; }
-if test ${ac_cv_lib_curses_slk_color+y}
+
+
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for curses function
wattr_on" >&5
+printf %s "checking for curses function wattr_on... " >&6; }
+if test ${ac_cv_lib_curses_wattr_on+y}
then :
printf %s "(cached) " >&6
else case e in #(
@@ -34257,8 +34302,8 @@ int
main (void)
{
- #ifndef slk_color
- void * volatile x = (void *)slk_color; (void)x;
+ #ifndef wattr_on
+ void * volatile x = (void *)wattr_on; (void)x;
#endif
;
@@ -34267,9 +34312,9 @@ main (void)
_ACEOF
if ac_fn_c_try_link "$LINENO"
then :
- ac_cv_lib_curses_slk_color=yes
+ ac_cv_lib_curses_wattr_on=yes
else case e in #(
- e) ac_cv_lib_curses_slk_color=no ;;
+ e) ac_cv_lib_curses_wattr_on=no ;;
esac
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam \
@@ -34277,12 +34322,12 @@ rm -f core conftest.err conftest.$ac_objext
conftest.beam \
;;
esac
fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_lib_curses_slk_color" >&5
-printf "%s\n" "$ac_cv_lib_curses_slk_color" >&6; }
- if test "x$ac_cv_lib_curses_slk_color" = xyes
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_lib_curses_wattr_on" >&5
+printf "%s\n" "$ac_cv_lib_curses_wattr_on" >&6; }
+ if test "x$ac_cv_lib_curses_wattr_on" = xyes
then :
-printf "%s\n" "#define HAVE_CURSES_SLK_COLOR 1" >>confdefs.h
+printf "%s\n" "#define _Py_HAVE_CURSES_WATTR_ON 1" >>confdefs.h
fi
@@ -34290,9 +34335,11 @@ fi
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for curses variable
ESCDELAY" >&5
-printf %s "checking for curses variable ESCDELAY... " >&6; }
-if test ${ac_cv_lib_curses_ESCDELAY+y}
+
+
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for curses function
wattr_set" >&5
+printf %s "checking for curses function wattr_set... " >&6; }
+if test ${ac_cv_lib_curses_wattr_set+y}
then :
printf %s "(cached) " >&6
else case e in #(
@@ -34318,29 +34365,32 @@ int
main (void)
{
- int x = ESCDELAY; (void)x;
+ #ifndef wattr_set
+ void * volatile x = (void *)wattr_set; (void)x;
+ #endif
;
return 0;
}
_ACEOF
-if ac_fn_c_try_compile "$LINENO"
+if ac_fn_c_try_link "$LINENO"
then :
- ac_cv_lib_curses_ESCDELAY=yes
+ ac_cv_lib_curses_wattr_set=yes
else case e in #(
- e) ac_cv_lib_curses_ESCDELAY=no ;;
+ e) ac_cv_lib_curses_wattr_set=no ;;
esac
fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+ conftest$ac_exeext conftest.$ac_ext
;;
esac
fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_lib_curses_ESCDELAY" >&5
-printf "%s\n" "$ac_cv_lib_curses_ESCDELAY" >&6; }
- if test "x$ac_cv_lib_curses_ESCDELAY" = xyes
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_lib_curses_wattr_set" >&5
+printf "%s\n" "$ac_cv_lib_curses_wattr_set" >&6; }
+ if test "x$ac_cv_lib_curses_wattr_set" = xyes
then :
-printf "%s\n" "#define HAVE_CURSES_ESCDELAY 1" >>confdefs.h
+printf "%s\n" "#define _Py_HAVE_CURSES_WATTR_SET 1" >>confdefs.h
fi
@@ -34348,9 +34398,11 @@ fi
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for curses variable
TABSIZE" >&5
-printf %s "checking for curses variable TABSIZE... " >&6; }
-if test ${ac_cv_lib_curses_TABSIZE+y}
+
+
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for curses function
wcolor_set" >&5
+printf %s "checking for curses function wcolor_set... " >&6; }
+if test ${ac_cv_lib_curses_wcolor_set+y}
then :
printf %s "(cached) " >&6
else case e in #(
@@ -34376,35 +34428,39 @@ int
main (void)
{
- int x = TABSIZE; (void)x;
+ #ifndef wcolor_set
+ void * volatile x = (void *)wcolor_set; (void)x;
+ #endif
;
return 0;
}
_ACEOF
-if ac_fn_c_try_compile "$LINENO"
+if ac_fn_c_try_link "$LINENO"
then :
- ac_cv_lib_curses_TABSIZE=yes
+ ac_cv_lib_curses_wcolor_set=yes
else case e in #(
- e) ac_cv_lib_curses_TABSIZE=no ;;
+ e) ac_cv_lib_curses_wcolor_set=no ;;
esac
fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+ conftest$ac_exeext conftest.$ac_ext
;;
esac
fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_lib_curses_TABSIZE" >&5
-printf "%s\n" "$ac_cv_lib_curses_TABSIZE" >&6; }
- if test "x$ac_cv_lib_curses_TABSIZE" = xyes
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_lib_curses_wcolor_set" >&5
+printf "%s\n" "$ac_cv_lib_curses_wcolor_set" >&6; }
+ if test "x$ac_cv_lib_curses_wcolor_set" = xyes
then :
-printf "%s\n" "#define HAVE_CURSES_TABSIZE 1" >>confdefs.h
+printf "%s\n" "#define _Py_HAVE_CURSES_WCOLOR_SET 1" >>confdefs.h
fi
+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ncurses-style
curses function getmouse" >&5
printf %s "checking for ncurses-style curses function getmouse... " >&6; }
if test ${ac_cv_lib_curses_getmouse+y}
@@ -34458,6 +34514,7 @@ fi
+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for curses function
scr_dump" >&5
printf %s "checking for curses function scr_dump... " >&6; }
if test ${ac_cv_lib_curses_scr_dump+y}
@@ -34511,7 +34568,7 @@ printf "%s\n" "$ac_cv_lib_curses_scr_dump" >&6; }
if test "x$ac_cv_lib_curses_scr_dump" = xyes
then :
-printf "%s\n" "#define HAVE_CURSES_SCR_DUMP 1" >>confdefs.h
+printf "%s\n" "#define _Py_HAVE_CURSES_SCR_DUMP 1" >>confdefs.h
fi
@@ -34519,6 +34576,8 @@ fi
+
+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for curses function
scr_set" >&5
printf %s "checking for curses function scr_set... " >&6; }
if test ${ac_cv_lib_curses_scr_set+y}
@@ -34572,12 +34631,14 @@ printf "%s\n" "$ac_cv_lib_curses_scr_set" >&6; }
if test "x$ac_cv_lib_curses_scr_set" = xyes
then :
-printf "%s\n" "#define HAVE_CURSES_SCR_SET 1" >>confdefs.h
+printf "%s\n" "#define _Py_HAVE_CURSES_SCR_SET 1" >>confdefs.h
fi
+
+
CPPFLAGS=$ac_save_cppflags
fi
diff --git a/configure.ac b/configure.ac
index f6f4055079eaa1..234e2fbc920822 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7666,6 +7666,7 @@ dnl lacks, for example term_attrs() in the narrow ncurses
library.
AC_DEFUN([PY_CHECK_CURSES_FUNC],
[ AS_VAR_PUSHDEF([py_var], [ac_cv_lib_curses_$1])
AS_VAR_PUSHDEF([py_define], [HAVE_CURSES_]m4_toupper($1))
+ AS_VAR_PUSHDEF([py_define], m4_ifblank([$3], [[HAVE_CURSES_]m4_toupper($1)],
[$3]))
AC_CACHE_CHECK(
[for curses function $1],
[py_var],
@@ -7686,6 +7687,13 @@ AC_DEFUN([PY_CHECK_CURSES_FUNC],
AS_VAR_POPDEF([py_define])
])
+dnl PY_CHECK_CURSES_FUNC_PRIVATE(FUNCTION, [INCLUDES], [AC_DEFINE-VAR])
+dnl Similar to PY_CHECK_CURSES_FUNC but define macro _Py_HAVE_CURSES_xxx,
+dnl instead of HAVE_CURSES_xxx
+AC_DEFUN([PY_CHECK_CURSES_FUNC_PRIVATE],
+[ PY_CHECK_CURSES_FUNC([$1], [$2], m4_ifblank([$3],
[[_Py_HAVE_CURSES_]m4_toupper($1)], [$3]))
+])
+
dnl PY_CHECK_CURSES_VAR(VARIABLE)
dnl Like PY_CHECK_CURSES_FUNC, but for an integer variable (or macro), such as
dnl ESCDELAY, which a function probe cannot detect.
@@ -7718,36 +7726,37 @@ PY_CHECK_CURSES_FUNC([immedok])
PY_CHECK_CURSES_FUNC([syncok])
PY_CHECK_CURSES_FUNC([wchgat])
PY_CHECK_CURSES_FUNC([filter])
-PY_CHECK_CURSES_FUNC([nofilter])
PY_CHECK_CURSES_FUNC([has_key])
-PY_CHECK_CURSES_FUNC([has_mouse])
-PY_CHECK_CURSES_FUNC([is_keypad])
-PY_CHECK_CURSES_FUNC([is_leaveok])
PY_CHECK_CURSES_FUNC([typeahead])
PY_CHECK_CURSES_FUNC([use_env])
-PY_CHECK_CURSES_FUNC([new_prescr])
-PY_CHECK_CURSES_FUNC([use_screen])
-PY_CHECK_CURSES_FUNC([use_window])
-PY_CHECK_CURSES_FUNC([key_defined])
-PY_CHECK_CURSES_FUNC([term_attrs])
-PY_CHECK_CURSES_FUNC([define_key])
-PY_CHECK_CURSES_FUNC([keyok])
PY_CHECK_CURSES_FUNC([set_escdelay])
PY_CHECK_CURSES_FUNC([set_tabsize])
dnl The X/Open attr_t and soft-label attribute functions are absent on old
dnl SVr4 curses (e.g. illumos).
-PY_CHECK_CURSES_FUNC([wattr_get])
-PY_CHECK_CURSES_FUNC([wattr_set])
-PY_CHECK_CURSES_FUNC([wattr_on])
-PY_CHECK_CURSES_FUNC([wattr_off])
-PY_CHECK_CURSES_FUNC([wcolor_set])
-PY_CHECK_CURSES_FUNC([slk_attr_on])
-PY_CHECK_CURSES_FUNC([slk_attr_off])
-PY_CHECK_CURSES_FUNC([slk_attr_set])
-PY_CHECK_CURSES_FUNC([slk_color])
PY_CHECK_CURSES_VAR([ESCDELAY])
PY_CHECK_CURSES_VAR([TABSIZE])
+PY_CHECK_CURSES_FUNC_PRIVATE([define_key])
+PY_CHECK_CURSES_FUNC_PRIVATE([has_mouse])
+PY_CHECK_CURSES_FUNC_PRIVATE([is_keypad])
+PY_CHECK_CURSES_FUNC_PRIVATE([is_leaveok])
+PY_CHECK_CURSES_FUNC_PRIVATE([key_defined])
+PY_CHECK_CURSES_FUNC_PRIVATE([keyok])
+PY_CHECK_CURSES_FUNC_PRIVATE([new_prescr])
+PY_CHECK_CURSES_FUNC_PRIVATE([nofilter])
+PY_CHECK_CURSES_FUNC_PRIVATE([slk_attr_off])
+PY_CHECK_CURSES_FUNC_PRIVATE([slk_attr_on])
+PY_CHECK_CURSES_FUNC_PRIVATE([slk_attr_set])
+PY_CHECK_CURSES_FUNC_PRIVATE([slk_color])
+PY_CHECK_CURSES_FUNC_PRIVATE([term_attrs])
+PY_CHECK_CURSES_FUNC_PRIVATE([use_screen])
+PY_CHECK_CURSES_FUNC_PRIVATE([use_window])
+PY_CHECK_CURSES_FUNC_PRIVATE([wattr_get])
+PY_CHECK_CURSES_FUNC_PRIVATE([wattr_off])
+PY_CHECK_CURSES_FUNC_PRIVATE([wattr_on])
+PY_CHECK_CURSES_FUNC_PRIVATE([wattr_set])
+PY_CHECK_CURSES_FUNC_PRIVATE([wcolor_set])
+
dnl Probe for the X/Open getmouse(MEVENT *) signature specifically: PDCurses
dnl declares an incompatible getmouse(void) unless built for the ncurses mouse
API.
AC_CACHE_CHECK([for ncurses-style curses function getmouse],
@@ -7762,8 +7771,9 @@ AS_VAR_IF([ac_cv_lib_curses_getmouse], [yes],
dnl scr_dump gates scr_dump/scr_restore/scr_init; scr_set is separate, since
dnl old SVr4 curses (e.g. illumos) has the former but not scr_set.
-PY_CHECK_CURSES_FUNC([scr_dump])
-PY_CHECK_CURSES_FUNC([scr_set])
+PY_CHECK_CURSES_FUNC_PRIVATE([scr_dump])
+PY_CHECK_CURSES_FUNC_PRIVATE([scr_set])
+
CPPFLAGS=$ac_save_cppflags
])dnl have_curses != no
])dnl save env
diff --git a/pyconfig.h.in b/pyconfig.h.in
index 90d8a07df66083..1d4f445a8b1fda 100644
--- a/pyconfig.h.in
+++ b/pyconfig.h.in
@@ -185,9 +185,6 @@
/* Define if you have the 'ctermid_r' function. */
#undef HAVE_CTERMID_R
-/* Define if you have the 'define_key' function. */
-#undef HAVE_CURSES_DEFINE_KEY
-
/* Define if you have the 'ESCDELAY' variable. */
#undef HAVE_CURSES_ESCDELAY
@@ -203,105 +200,42 @@
/* Define if you have the 'has_key' function. */
#undef HAVE_CURSES_HAS_KEY
-/* Define if you have the 'has_mouse' function. */
-#undef HAVE_CURSES_HAS_MOUSE
-
/* Define if you have the 'immedok' function. */
#undef HAVE_CURSES_IMMEDOK
-/* Define if you have the 'is_keypad' function. */
-#undef HAVE_CURSES_IS_KEYPAD
-
-/* Define if you have the 'is_leaveok' function. */
-#undef HAVE_CURSES_IS_LEAVEOK
-
/* Define if you have the 'is_pad' function. */
#undef HAVE_CURSES_IS_PAD
/* Define if you have the 'is_term_resized' function. */
#undef HAVE_CURSES_IS_TERM_RESIZED
-/* Define if you have the 'keyok' function. */
-#undef HAVE_CURSES_KEYOK
-
-/* Define if you have the 'key_defined' function. */
-#undef HAVE_CURSES_KEY_DEFINED
-
-/* Define if you have the 'new_prescr' function. */
-#undef HAVE_CURSES_NEW_PRESCR
-
-/* Define if you have the 'nofilter' function. */
-#undef HAVE_CURSES_NOFILTER
-
/* Define if you have the 'resizeterm' function. */
#undef HAVE_CURSES_RESIZETERM
/* Define if you have the 'resize_term' function. */
#undef HAVE_CURSES_RESIZE_TERM
-/* Define if you have the 'scr_dump' function. */
-#undef HAVE_CURSES_SCR_DUMP
-
-/* Define if you have the 'scr_set' function. */
-#undef HAVE_CURSES_SCR_SET
-
/* Define if you have the 'set_escdelay' function. */
#undef HAVE_CURSES_SET_ESCDELAY
/* Define if you have the 'set_tabsize' function. */
#undef HAVE_CURSES_SET_TABSIZE
-/* Define if you have the 'slk_attr_off' function. */
-#undef HAVE_CURSES_SLK_ATTR_OFF
-
-/* Define if you have the 'slk_attr_on' function. */
-#undef HAVE_CURSES_SLK_ATTR_ON
-
-/* Define if you have the 'slk_attr_set' function. */
-#undef HAVE_CURSES_SLK_ATTR_SET
-
-/* Define if you have the 'slk_color' function. */
-#undef HAVE_CURSES_SLK_COLOR
-
/* Define if you have the 'syncok' function. */
#undef HAVE_CURSES_SYNCOK
/* Define if you have the 'TABSIZE' variable. */
#undef HAVE_CURSES_TABSIZE
-/* Define if you have the 'term_attrs' function. */
-#undef HAVE_CURSES_TERM_ATTRS
-
/* Define if you have the 'typeahead' function. */
#undef HAVE_CURSES_TYPEAHEAD
/* Define if you have the 'use_env' function. */
#undef HAVE_CURSES_USE_ENV
-/* Define if you have the 'use_screen' function. */
-#undef HAVE_CURSES_USE_SCREEN
-
-/* Define if you have the 'use_window' function. */
-#undef HAVE_CURSES_USE_WINDOW
-
-/* Define if you have the 'wattr_get' function. */
-#undef HAVE_CURSES_WATTR_GET
-
-/* Define if you have the 'wattr_off' function. */
-#undef HAVE_CURSES_WATTR_OFF
-
-/* Define if you have the 'wattr_on' function. */
-#undef HAVE_CURSES_WATTR_ON
-
-/* Define if you have the 'wattr_set' function. */
-#undef HAVE_CURSES_WATTR_SET
-
/* Define if you have the 'wchgat' function. */
#undef HAVE_CURSES_WCHGAT
-/* Define if you have the 'wcolor_set' function. */
-#undef HAVE_CURSES_WCOLOR_SET
-
/* Define to 1 if you have the <db.h> header file. */
#undef HAVE_DB_H
@@ -2117,6 +2051,72 @@
/* Define if you have the 'cospi' function. */
#undef _Py_HAVE_COSPI
+/* Define if you have the 'define_key' function. */
+#undef _Py_HAVE_CURSES_DEFINE_KEY
+
+/* Define if you have the 'has_mouse' function. */
+#undef _Py_HAVE_CURSES_HAS_MOUSE
+
+/* Define if you have the 'is_keypad' function. */
+#undef _Py_HAVE_CURSES_IS_KEYPAD
+
+/* Define if you have the 'is_leaveok' function. */
+#undef _Py_HAVE_CURSES_IS_LEAVEOK
+
+/* Define if you have the 'keyok' function. */
+#undef _Py_HAVE_CURSES_KEYOK
+
+/* Define if you have the 'key_defined' function. */
+#undef _Py_HAVE_CURSES_KEY_DEFINED
+
+/* Define if you have the 'new_prescr' function. */
+#undef _Py_HAVE_CURSES_NEW_PRESCR
+
+/* Define if you have the 'nofilter' function. */
+#undef _Py_HAVE_CURSES_NOFILTER
+
+/* Define if you have the 'scr_dump' function. */
+#undef _Py_HAVE_CURSES_SCR_DUMP
+
+/* Define if you have the 'scr_set' function. */
+#undef _Py_HAVE_CURSES_SCR_SET
+
+/* Define if you have the 'slk_attr_off' function. */
+#undef _Py_HAVE_CURSES_SLK_ATTR_OFF
+
+/* Define if you have the 'slk_attr_on' function. */
+#undef _Py_HAVE_CURSES_SLK_ATTR_ON
+
+/* Define if you have the 'slk_attr_set' function. */
+#undef _Py_HAVE_CURSES_SLK_ATTR_SET
+
+/* Define if you have the 'slk_color' function. */
+#undef _Py_HAVE_CURSES_SLK_COLOR
+
+/* Define if you have the 'term_attrs' function. */
+#undef _Py_HAVE_CURSES_TERM_ATTRS
+
+/* Define if you have the 'use_screen' function. */
+#undef _Py_HAVE_CURSES_USE_SCREEN
+
+/* Define if you have the 'use_window' function. */
+#undef _Py_HAVE_CURSES_USE_WINDOW
+
+/* Define if you have the 'wattr_get' function. */
+#undef _Py_HAVE_CURSES_WATTR_GET
+
+/* Define if you have the 'wattr_off' function. */
+#undef _Py_HAVE_CURSES_WATTR_OFF
+
+/* Define if you have the 'wattr_on' function. */
+#undef _Py_HAVE_CURSES_WATTR_ON
+
+/* Define if you have the 'wattr_set' function. */
+#undef _Py_HAVE_CURSES_WATTR_SET
+
+/* Define if you have the 'wcolor_set' function. */
+#undef _Py_HAVE_CURSES_WCOLOR_SET
+
/* Define if compiler supports __builtin_shufflevector with 128-bit vectors
AND the target architecture has native SIMD (not just API availability) */
#undef _Py_HAVE_EFFICIENT_BUILTIN_SHUFFLEVECTOR
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3//lists/python-checkins.python.org
Member address: [email protected]