Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

gh-115765: Don't use deprecated AC_CHECK_TYPE macro in configure.ac (#115792) 

Instead use AC_CHECK_TYPES.
This commit is contained in:
Erlend E. Aasland 2024-02-22 10:04:15 +01:00 committed by GitHub
parent 7bc79371a6
commit baae73d730
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
configure generated vendored
View File

@ -11496,12 +11496,16 @@ then :
printf "%s\n" "#define HAVE_SSIZE_T 1" >>confdefs.h printf "%s\n" "#define HAVE_SSIZE_T 1" >>confdefs.h
fi fi
ac_fn_c_check_type "$LINENO" "__uint128_t" "ac_cv_type___uint128_t" "$ac_includes_default" ac_fn_c_check_type "$LINENO" "__uint128_t" "ac_cv_type___uint128_t" "$ac_includes_default"
if test "x$ac_cv_type___uint128_t" = xyes if test "x$ac_cv_type___uint128_t" = xyes
then : then :
printf "%s\n" "#define HAVE___UINT128_T 1" >>confdefs.h
printf "%s\n" "#define HAVE_GCC_UINT128_T 1" >>confdefs.h printf "%s\n" "#define HAVE_GCC_UINT128_T 1" >>confdefs.h
fi fi
@ -24961,6 +24965,7 @@ then :
printf "%s\n" "#define HAVE_RL_COMPDISP_FUNC_T 1" >>confdefs.h printf "%s\n" "#define HAVE_RL_COMPDISP_FUNC_T 1" >>confdefs.h
fi fi
@ -26783,6 +26788,9 @@ ac_fn_c_check_type "$LINENO" "socklen_t" "ac_cv_type_socklen_t" "
if test "x$ac_cv_type_socklen_t" = xyes if test "x$ac_cv_type_socklen_t" = xyes
then : then :
printf "%s\n" "#define HAVE_SOCKLEN_T 1" >>confdefs.h
else $as_nop else $as_nop
printf "%s\n" "#define socklen_t int" >>confdefs.h printf "%s\n" "#define socklen_t int" >>confdefs.h

25
configure.ac
View File

@ -2910,12 +2910,10 @@ AC_DEFINE_UNQUOTED([RETSIGTYPE],[void],[assume C89 semantics that RETSIGTYPE is
AC_TYPE_SIZE_T AC_TYPE_SIZE_T
AC_TYPE_UID_T AC_TYPE_UID_T
AC_CHECK_TYPE([ssize_t], AC_CHECK_TYPES([ssize_t])
AC_DEFINE([HAVE_SSIZE_T], [1], AC_CHECK_TYPES([__uint128_t],
[Define if your compiler provides ssize_t]), [], []) [AC_DEFINE([HAVE_GCC_UINT128_T], [1],
AC_CHECK_TYPE([__uint128_t], [Define if your compiler provides __uint128_t])])
AC_DEFINE([HAVE_GCC_UINT128_T], [1],
[Define if your compiler provides __uint128_t]), [], [])
# Sizes and alignments of various common basic types # Sizes and alignments of various common basic types
# ANSI C requires sizeof(char) == 1, so no need to check it # ANSI C requires sizeof(char) == 1, so no need to check it
@ -6153,11 +6151,7 @@ AS_VAR_IF([with_readline], [no], [
]) ])
# in readline as well as newer editline (April 2023) # in readline as well as newer editline (April 2023)
AC_CHECK_TYPE([rl_compdisp_func_t], AC_CHECK_TYPES([rl_compdisp_func_t], [], [], [readline_includes])
[AC_DEFINE([HAVE_RL_COMPDISP_FUNC_T], [1],
[Define if readline supports rl_compdisp_func_t])],
[],
[readline_includes])
m4_undefine([readline_includes]) m4_undefine([readline_includes])
])dnl WITH_SAVE_ENV() ])dnl WITH_SAVE_ENV()
@ -6555,12 +6549,9 @@ then
LIBS="$LIBS -framework CoreFoundation" LIBS="$LIBS -framework CoreFoundation"
fi fi
AC_CHECK_TYPE( AC_CHECK_TYPES([socklen_t], [],
[socklen_t], [], [AC_DEFINE([socklen_t], [int],
[AC_DEFINE( [Define to 'int' if <sys/socket.h> does not define.])], [
[socklen_t], [int],
[Define to `int' if <sys/socket.h> does not define.]
)], [
#ifdef HAVE_SYS_TYPES_H #ifdef HAVE_SYS_TYPES_H
#include <sys/types.h> #include <sys/types.h>
#endif #endif

12
pyconfig.h.in
View File

@ -1009,7 +1009,7 @@
/* Define if you can turn off readline's signal handling. */ /* Define if you can turn off readline's signal handling. */
#undef HAVE_RL_CATCH_SIGNAL #undef HAVE_RL_CATCH_SIGNAL
/* Define if readline supports rl_compdisp_func_t */ /* Define to 1 if the system has the type `rl_compdisp_func_t'. */
#undef HAVE_RL_COMPDISP_FUNC_T #undef HAVE_RL_COMPDISP_FUNC_T
/* Define if you have readline 2.2 */ /* Define if you have readline 2.2 */
@ -1195,13 +1195,16 @@
/* Define if you have the 'socketpair' function. */ /* Define if you have the 'socketpair' function. */
#undef HAVE_SOCKETPAIR #undef HAVE_SOCKETPAIR
/* Define to 1 if the system has the type `socklen_t'. */
#undef HAVE_SOCKLEN_T
/* Define to 1 if you have the <spawn.h> header file. */ /* Define to 1 if you have the <spawn.h> header file. */
#undef HAVE_SPAWN_H #undef HAVE_SPAWN_H
/* Define to 1 if you have the `splice' function. */ /* Define to 1 if you have the `splice' function. */
#undef HAVE_SPLICE #undef HAVE_SPLICE
/* Define if your compiler provides ssize_t */ /* Define to 1 if the system has the type `ssize_t'. */
#undef HAVE_SSIZE_T #undef HAVE_SSIZE_T
/* Define to 1 if you have the `statvfs' function. */ /* Define to 1 if you have the `statvfs' function. */
@ -1568,6 +1571,9 @@
/* Define to 1 if you have the `_getpty' function. */ /* Define to 1 if you have the `_getpty' function. */
#undef HAVE__GETPTY #undef HAVE__GETPTY
/* Define to 1 if the system has the type `__uint128_t'. */
#undef HAVE___UINT128_T
/* Define to 1 if `major', `minor', and `makedev' are declared in <mkdev.h>. /* Define to 1 if `major', `minor', and `makedev' are declared in <mkdev.h>.
*/ */
#undef MAJOR_IN_MKDEV #undef MAJOR_IN_MKDEV
@ -1956,7 +1962,7 @@
/* Define to `unsigned int' if <sys/types.h> does not define. */ /* Define to `unsigned int' if <sys/types.h> does not define. */
#undef size_t #undef size_t
/* Define to `int' if <sys/socket.h> does not define. */ /* Define to 'int' if <sys/socket.h> does not define. */
#undef socklen_t #undef socklen_t
/* Define to `int' if <sys/types.h> doesn't define. */ /* Define to `int' if <sys/types.h> doesn't define. */