Skip to content

Commit

Permalink
pythongh-115765: Don't use deprecated AC_CHECK_TYPE macro in configur…
Browse files Browse the repository at this point in the history
…e.ac (python#115792)

Instead use AC_CHECK_TYPES.
  • Loading branch information
erlend-aasland authored and woodruffw committed Mar 4, 2024
1 parent e90c72e commit eca0811
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 20 deletions.
8 changes: 8 additions & 0 deletions configure

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 8 additions & 17 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -2910,12 +2910,10 @@ AC_DEFINE_UNQUOTED([RETSIGTYPE],[void],[assume C89 semantics that RETSIGTYPE is
AC_TYPE_SIZE_T
AC_TYPE_UID_T

AC_CHECK_TYPE([ssize_t],
AC_DEFINE([HAVE_SSIZE_T], [1],
[Define if your compiler provides ssize_t]), [], [])
AC_CHECK_TYPE([__uint128_t],
AC_DEFINE([HAVE_GCC_UINT128_T], [1],
[Define if your compiler provides __uint128_t]), [], [])
AC_CHECK_TYPES([ssize_t])
AC_CHECK_TYPES([__uint128_t],
[AC_DEFINE([HAVE_GCC_UINT128_T], [1],
[Define if your compiler provides __uint128_t])])

# Sizes and alignments of various common basic types
# ANSI C requires sizeof(char) == 1, so no need to check it
Expand Down Expand Up @@ -6153,11 +6151,7 @@ AS_VAR_IF([with_readline], [no], [
])
# in readline as well as newer editline (April 2023)
AC_CHECK_TYPE([rl_compdisp_func_t],
[AC_DEFINE([HAVE_RL_COMPDISP_FUNC_T], [1],
[Define if readline supports rl_compdisp_func_t])],
[],
[readline_includes])
AC_CHECK_TYPES([rl_compdisp_func_t], [], [], [readline_includes])
m4_undefine([readline_includes])
])dnl WITH_SAVE_ENV()
Expand Down Expand Up @@ -6555,12 +6549,9 @@ then
LIBS="$LIBS -framework CoreFoundation"
fi

AC_CHECK_TYPE(
[socklen_t], [],
[AC_DEFINE(
[socklen_t], [int],
[Define to `int' if <sys/socket.h> does not define.]
)], [
AC_CHECK_TYPES([socklen_t], [],
[AC_DEFINE([socklen_t], [int],
[Define to 'int' if <sys/socket.h> does not define.])], [
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
Expand Down
12 changes: 9 additions & 3 deletions pyconfig.h.in
Original file line number Diff line number Diff line change
Expand Up @@ -1009,7 +1009,7 @@
/* Define if you can turn off readline's signal handling. */
#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

/* Define if you have readline 2.2 */
Expand Down Expand Up @@ -1195,13 +1195,16 @@
/* Define if you have the 'socketpair' function. */
#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. */
#undef HAVE_SPAWN_H

/* Define to 1 if you have the `splice' function. */
#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

/* Define to 1 if you have the `statvfs' function. */
Expand Down Expand Up @@ -1568,6 +1571,9 @@
/* Define to 1 if you have the `_getpty' function. */
#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>.
*/
#undef MAJOR_IN_MKDEV
Expand Down Expand Up @@ -1956,7 +1962,7 @@
/* Define to `unsigned int' if <sys/types.h> does not define. */
#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

/* Define to `int' if <sys/types.h> doesn't define. */
Expand Down

0 comments on commit eca0811

Please sign in to comment.