Skip to content

Commit 6b33719

Browse files
[3.12] gh-127614: Correctly check for ttyname_r() in configure (#128503) (#128599)
(cherry picked from commit e08b282) PR #14868 replaced the ttyname() call with ttyname_r(), but the old check remained.
1 parent 82b061d commit 6b33719

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed

Modules/clinic/posixmodule.c.h

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Modules/posixmodule.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3237,7 +3237,7 @@ os_access_impl(PyObject *module, path_t *path, int mode, int dir_fd,
32373237
#endif
32383238

32393239

3240-
#ifdef HAVE_TTYNAME
3240+
#ifdef HAVE_TTYNAME_R
32413241
/*[clinic input]
32423242
os.ttyname
32433243

configure

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4941,7 +4941,7 @@ AC_CHECK_FUNCS([ \
49414941
sigfillset siginterrupt sigpending sigrelse sigtimedwait sigwait \
49424942
sigwaitinfo snprintf splice strftime strlcpy strsignal symlinkat sync \
49434943
sysconf system tcgetpgrp tcsetpgrp tempnam timegm times tmpfile \
4944-
tmpnam tmpnam_r truncate ttyname umask uname unlinkat utimensat utimes vfork \
4944+
tmpnam tmpnam_r truncate ttyname_r umask uname unlinkat utimensat utimes vfork \
49454945
wait wait3 wait4 waitid waitpid wcscoll wcsftime wcsxfrm wmemcmp writev \
49464946
])
49474947

pyconfig.h.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1435,8 +1435,8 @@
14351435
/* Define to 1 if you have the `truncate' function. */
14361436
#undef HAVE_TRUNCATE
14371437

1438-
/* Define to 1 if you have the `ttyname' function. */
1439-
#undef HAVE_TTYNAME
1438+
/* Define to 1 if you have the `ttyname_r' function. */
1439+
#undef HAVE_TTYNAME_R
14401440

14411441
/* Define to 1 if you don't have `tm_zone' but do have the external array
14421442
`tzname'. */

0 commit comments

Comments
 (0)