mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-11 04:19:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

[3.13] gh-127614: Correctly check for ttyname_r() in configure (#128503) (#128598)

Browse source 
(cherry picked from commit e08b28235a)

PR #14868 replaced the ttyname() call with ttyname_r(), but the old
check remained.
This commit is contained in:
Erlend E. Aasland 2025-01-11 12:47:49 +01:00 • committed by GitHub
parent 3714fd07c5
commit 436064afd8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Modules/clinic/posixmodule.c.h generated
View file

@ -306,7 +306,7 @@ exit:
return return_value; return return_value;
} }
#if defined(HAVE_TTYNAME) #if defined(HAVE_TTYNAME_R)
PyDoc_STRVAR(os_ttyname__doc__, PyDoc_STRVAR(os_ttyname__doc__,
"ttyname($module, fd, /)\n" "ttyname($module, fd, /)\n"
@ -339,7 +339,7 @@ exit:
return return_value; return return_value;
} }
#endif /* defined(HAVE_TTYNAME) */ #endif /* defined(HAVE_TTYNAME_R) */
#if defined(HAVE_CTERMID) #if defined(HAVE_CTERMID)
@ -12879,4 +12879,4 @@ os__is_inputhook_installed(PyObject *module, PyObject *Py_UNUSED(ignored))
#ifndef OS__SUPPORTS_VIRTUAL_TERMINAL_METHODDEF #ifndef OS__SUPPORTS_VIRTUAL_TERMINAL_METHODDEF
#define OS__SUPPORTS_VIRTUAL_TERMINAL_METHODDEF #define OS__SUPPORTS_VIRTUAL_TERMINAL_METHODDEF
#endif /* !defined(OS__SUPPORTS_VIRTUAL_TERMINAL_METHODDEF) */ #endif /* !defined(OS__SUPPORTS_VIRTUAL_TERMINAL_METHODDEF) */
/*[clinic end generated code: output=a4410a686958d8e6 input=a9049054013a1b77]*/ /*[clinic end generated code: output=a75be356cd4abca5 input=a9049054013a1b77]*/

2
Modules/posixmodule.c
View file

@ -3298,7 +3298,7 @@ os_access_impl(PyObject *module, path_t *path, int mode, int dir_fd,
#endif #endif
#ifdef HAVE_TTYNAME #ifdef HAVE_TTYNAME_R
/*[clinic input] /*[clinic input]
os.ttyname os.ttyname

6
configure generated vendored
View file

@ -18943,10 +18943,10 @@ then :
printf "%s\n" "#define HAVE_TRUNCATE 1" >>confdefs.h printf "%s\n" "#define HAVE_TRUNCATE 1" >>confdefs.h
fi fi
ac_fn_c_check_func "$LINENO" "ttyname" "ac_cv_func_ttyname" ac_fn_c_check_func "$LINENO" "ttyname_r" "ac_cv_func_ttyname_r"
if test "x$ac_cv_func_ttyname" = xyes if test "x$ac_cv_func_ttyname_r" = xyes
then : then :
printf "%s\n" "#define HAVE_TTYNAME 1" >>confdefs.h printf "%s\n" "#define HAVE_TTYNAME_R 1" >>confdefs.h
fi fi
ac_fn_c_check_func "$LINENO" "umask" "ac_cv_func_umask" ac_fn_c_check_func "$LINENO" "umask" "ac_cv_func_umask"

2
configure.ac
View file

@ -5134,7 +5134,7 @@ AC_CHECK_FUNCS([ \
sigfillset siginterrupt sigpending sigrelse sigtimedwait sigwait \ sigfillset siginterrupt sigpending sigrelse sigtimedwait sigwait \
sigwaitinfo snprintf splice strftime strlcpy strsignal symlinkat sync \ sigwaitinfo snprintf splice strftime strlcpy strsignal symlinkat sync \
sysconf tcgetpgrp tcsetpgrp tempnam timegm times tmpfile \ sysconf tcgetpgrp tcsetpgrp tempnam timegm times tmpfile \
tmpnam tmpnam_r truncate ttyname umask uname unlinkat unlockpt utimensat utimes vfork \ tmpnam tmpnam_r truncate ttyname_r umask uname unlinkat unlockpt utimensat utimes vfork \
wait wait3 wait4 waitid waitpid wcscoll wcsftime wcsxfrm wmemcmp writev \ wait wait3 wait4 waitid waitpid wcscoll wcsftime wcsxfrm wmemcmp writev \
]) ])

4
pyconfig.h.in
View file

@ -1494,8 +1494,8 @@
/* Define to 1 if you have the `truncate' function. */ /* Define to 1 if you have the `truncate' function. */
#undef HAVE_TRUNCATE #undef HAVE_TRUNCATE
/* Define to 1 if you have the `ttyname' function. */ /* Define to 1 if you have the `ttyname_r' function. */
#undef HAVE_TTYNAME #undef HAVE_TTYNAME_R
/* Define to 1 if you don't have `tm_zone' but do have the external array /* Define to 1 if you don't have `tm_zone' but do have the external array
`tzname'. */ `tzname'. */