Skip to content

Commit c607551

Browse files
erlend-aaslanderlend-aasland
authored
[3.12] gh-89886: Use Autoconf quadrigraphs where appropriate (#105226) (#105423)
1 parent 2cfe778 commit c607551

File tree

1 file changed

+44
-44
lines changed

1 file changed

+44
-44
lines changed

‎configure.ac

+44-44
Original file line numberDiff line numberDiff line change
@@ -2616,7 +2616,7 @@ yes)
26162616
AC_MSG_RESULT([$MACOSX_DEPLOYMENT_TARGET])
26172617

26182618
AC_MSG_CHECKING([if specified universal architectures work])
2619-
AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>]], [[printf("%d", 42);]])],
2619+
AC_LINK_IFELSE([AC_LANG_PROGRAM([[@%:@include <stdio.h>]], [[printf("%d", 42);]])],
26202620
[AC_MSG_RESULT([yes])],
26212621
[AC_MSG_RESULT([no])
26222622
AC_MSG_ERROR([check config.log and use the '--with-universal-archs' option])
@@ -3057,7 +3057,7 @@ fi
30573057

30583058
AC_CACHE_CHECK([for pthread_t], [ac_cv_have_pthread_t], [
30593059
AC_COMPILE_IFELSE([
3060-
AC_LANG_PROGRAM([[#include <pthread.h>]], [[pthread_t x; x = *(pthread_t*)0;]])
3060+
AC_LANG_PROGRAM([[@%:@include <pthread.h>]], [[pthread_t x; x = *(pthread_t*)0;]])
30613061
], [ac_cv_have_pthread_t=yes], [ac_cv_have_pthread_t=no])
30623062
])
30633063
AS_VAR_IF([ac_cv_have_pthread_t], [yes], [
@@ -3070,11 +3070,11 @@ AS_VAR_IF([ac_cv_have_pthread_t], [yes], [
30703070

30713071
# Issue #25658: POSIX hasn't defined that pthread_key_t is compatible with int.
30723072
# This checking will be unnecessary after removing deprecated TLS API.
3073-
AC_CHECK_SIZEOF([pthread_key_t], [], [[#include <pthread.h>]])
3073+
AC_CHECK_SIZEOF([pthread_key_t], [], [[@%:@include <pthread.h>]])
30743074
AC_CACHE_CHECK([whether pthread_key_t is compatible with int], [ac_cv_pthread_key_t_is_arithmetic_type], [
30753075
if test "$ac_cv_sizeof_pthread_key_t" -eq "$ac_cv_sizeof_int" ; then
30763076
AC_COMPILE_IFELSE(
3077-
[AC_LANG_PROGRAM([[#include <pthread.h>]], [[pthread_key_t k; k * 1;]])],
3077+
[AC_LANG_PROGRAM([[@%:@include <pthread.h>]], [[pthread_key_t k; k * 1;]])],
30783078
[ac_cv_pthread_key_t_is_arithmetic_type=yes],
30793079
[ac_cv_pthread_key_t_is_arithmetic_type=no]
30803080
)
@@ -3615,7 +3615,7 @@ AC_CHECK_LIB([intl], [textdomain],
36153615
case "$ac_sys_system" in
36163616
AIX*) AC_MSG_CHECKING([for genuine AIX C++ extensions support])
36173617
AC_LINK_IFELSE([
3618-
AC_LANG_PROGRAM([[#include <load.h>]],
3618+
AC_LANG_PROGRAM([[@%:@include <load.h>]],
36193619
[[loadAndInit("", 0, "")]])
36203620
],[
36213621
AC_DEFINE([AIX_GENUINE_CPLUSPLUS], [1],
@@ -3833,9 +3833,9 @@ AS_VAR_IF([have_libffi], [yes], [
38333833
CFLAGS="$LIBFFI_CFLAGS $CFLAGS"
38343834
LDFLAGS="$LIBFFI_LIBS $LDFLAGS"
38353835
3836-
PY_CHECK_FUNC([ffi_prep_cif_var], [#include <ffi.h>])
3837-
PY_CHECK_FUNC([ffi_prep_closure_loc], [#include <ffi.h>])
3838-
PY_CHECK_FUNC([ffi_closure_alloc], [#include <ffi.h>])
3836+
PY_CHECK_FUNC([ffi_prep_cif_var], [@%:@include <ffi.h>])
3837+
PY_CHECK_FUNC([ffi_prep_closure_loc], [@%:@include <ffi.h>])
3838+
PY_CHECK_FUNC([ffi_closure_alloc], [@%:@include <ffi.h>])
38393839
])
38403840
])
38413841

@@ -4473,7 +4473,7 @@ AC_ARG_ENABLE([ipv6],
44734473
dnl the check does not work on cross compilation case...
44744474
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ /* AF_INET6 available check */
44754475
#include <sys/types.h>
4476-
#include <sys/socket.h>]],
4476+
@%:@include <sys/socket.h>]],
44774477
[[int domain = AF_INET6;]])],[
44784478
ipv6=yes
44794479
],[
@@ -4490,7 +4490,7 @@ if test "$ipv6" = "yes"; then
44904490
AC_MSG_CHECKING([if RFC2553 API is available])
44914491
AC_COMPILE_IFELSE([
44924492
AC_LANG_PROGRAM([[#include <sys/types.h>
4493-
#include <netinet/in.h>]],
4493+
@%:@include <netinet/in.h>]],
44944494
[[struct sockaddr_in6 x;
44954495
x.sin6_scope_id;]])
44964496
],[
@@ -4522,7 +4522,7 @@ if test "$ipv6" = "yes"; then
45224522
#include <netinet/in.h>
45234523
#ifdef IPV6_INRIA_VERSION
45244524
yes
4525-
#endif],
4525+
@%:@endif],
45264526
[ipv6type=$i])
45274527
;;
45284528
kame)
@@ -4531,7 +4531,7 @@ yes
45314531
#include <netinet/in.h>
45324532
#ifdef __KAME__
45334533
yes
4534-
#endif],
4534+
@%:@endif],
45354535
[ipv6type=$i;
45364536
ipv6lib=inet6
45374537
ipv6libdir=/usr/local/v6/lib
@@ -4543,7 +4543,7 @@ yes
45434543
#include <features.h>
45444544
#if defined(__GLIBC__) && ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2))
45454545
yes
4546-
#endif],
4546+
@%:@endif],
45474547
[ipv6type=$i;
45484548
ipv6trylibc=yes])
45494549
;;
@@ -4569,7 +4569,7 @@ yes
45694569
#include <sys/param.h>
45704570
#ifdef _TOSHIBA_INET6
45714571
yes
4572-
#endif],
4572+
@%:@endif],
45734573
[ipv6type=$i;
45744574
ipv6lib=inet6;
45754575
ipv6libdir=/usr/local/v6/lib])
@@ -4579,7 +4579,7 @@ yes
45794579
#include </usr/local/v6/include/sys/v6config.h>
45804580
#ifdef __V6D__
45814581
yes
4582-
#endif],
4582+
@%:@endif],
45834583
[ipv6type=$i;
45844584
ipv6lib=v6;
45854585
ipv6libdir=/usr/local/v6/lib;
@@ -4590,7 +4590,7 @@ yes
45904590
#include <sys/param.h>
45914591
#ifdef _ZETA_MINAMI_INET6
45924592
yes
4593-
#endif],
4593+
@%:@endif],
45944594
[ipv6type=$i;
45954595
ipv6lib=inet6;
45964596
ipv6libdir=/usr/local/v6/lib])
@@ -4623,7 +4623,7 @@ fi
46234623

46244624
AC_CACHE_CHECK([CAN_RAW_FD_FRAMES], [ac_cv_can_raw_fd_frames], [
46254625
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ /* CAN_RAW_FD_FRAMES available check */
4626-
#include <linux/can/raw.h>]],
4626+
@%:@include <linux/can/raw.h>]],
46274627
[[int can_raw_fd_frames = CAN_RAW_FD_FRAMES;]])],
46284628
[ac_cv_can_raw_fd_frames=yes],
46294629
[ac_cv_can_raw_fd_frames=no])
@@ -4635,7 +4635,7 @@ AS_VAR_IF([ac_cv_can_raw_fd_frames], [yes], [
46354635

46364636
AC_CACHE_CHECK([for CAN_RAW_JOIN_FILTERS], [ac_cv_can_raw_join_filters], [
46374637
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
4638-
#include <linux/can/raw.h>]],
4638+
@%:@include <linux/can/raw.h>]],
46394639
[[int can_raw_join_filters = CAN_RAW_JOIN_FILTERS;]])],
46404640
[ac_cv_can_raw_join_filters=yes],
46414641
[ac_cv_can_raw_join_filters=no])
@@ -4882,14 +4882,14 @@ AC_CHECK_DECL([dirfd],
48824882

48834883
# For some functions, having a definition is not sufficient, since
48844884
# we want to take their address.
4885-
PY_CHECK_FUNC([chroot], [#include <unistd.h>])
4886-
PY_CHECK_FUNC([link], [#include <unistd.h>])
4887-
PY_CHECK_FUNC([symlink], [#include <unistd.h>])
4888-
PY_CHECK_FUNC([fchdir], [#include <unistd.h>])
4889-
PY_CHECK_FUNC([fsync], [#include <unistd.h>])
4890-
PY_CHECK_FUNC([fdatasync], [#include <unistd.h>])
4891-
PY_CHECK_FUNC([epoll_create], [#include <sys/epoll.h>], [HAVE_EPOLL])
4892-
PY_CHECK_FUNC([epoll_create1], [#include <sys/epoll.h>])
4885+
PY_CHECK_FUNC([chroot], [@%:@include <unistd.h>])
4886+
PY_CHECK_FUNC([link], [@%:@include <unistd.h>])
4887+
PY_CHECK_FUNC([symlink], [@%:@include <unistd.h>])
4888+
PY_CHECK_FUNC([fchdir], [@%:@include <unistd.h>])
4889+
PY_CHECK_FUNC([fsync], [@%:@include <unistd.h>])
4890+
PY_CHECK_FUNC([fdatasync], [@%:@include <unistd.h>])
4891+
PY_CHECK_FUNC([epoll_create], [@%:@include <sys/epoll.h>], [HAVE_EPOLL])
4892+
PY_CHECK_FUNC([epoll_create1], [@%:@include <sys/epoll.h>])
48934893
PY_CHECK_FUNC([kqueue],[
48944894
#include <sys/types.h>
48954895
#include <sys/event.h>
@@ -4899,7 +4899,7 @@ PY_CHECK_FUNC([prlimit], [
48994899
#include <sys/resource.h>
49004900
])
49014901

4902-
PY_CHECK_FUNC([_dyld_shared_cache_contains_path], [#include <mach-o/dyld.h>], [HAVE_DYLD_SHARED_CACHE_CONTAINS_PATH])
4902+
PY_CHECK_FUNC([_dyld_shared_cache_contains_path], [@%:@include <mach-o/dyld.h>], [HAVE_DYLD_SHARED_CACHE_CONTAINS_PATH])
49034903

49044904
PY_CHECK_FUNC([memfd_create], [
49054905
#ifdef HAVE_SYS_MMAN_H
@@ -4922,12 +4922,12 @@ PY_CHECK_FUNC([eventfd], [
49224922
# address to avoid compiler warnings and potential miscompilations
49234923
# because of the missing prototypes.
49244924

4925-
PY_CHECK_FUNC([ctermid_r], [#include <stdio.h>])
4925+
PY_CHECK_FUNC([ctermid_r], [@%:@include <stdio.h>])
49264926

49274927
AC_CACHE_CHECK([for flock declaration], [ac_cv_flock_decl],
49284928
[AC_COMPILE_IFELSE(
49294929
[AC_LANG_PROGRAM(
4930-
[#include <sys/file.h>],
4930+
[@%:@include <sys/file.h>],
49314931
[void* p = flock]
49324932
)],
49334933
[ac_cv_flock_decl=yes],
@@ -4939,12 +4939,12 @@ AS_VAR_IF([ac_cv_flock_decl], [yes],
49394939
[AC_CHECK_FUNCS([flock], [],
49404940
[AC_CHECK_LIB([bsd], [flock], [FCNTL_LIBS="-lbsd"])])])
49414941

4942-
PY_CHECK_FUNC([getpagesize], [#include <unistd.h>])
4942+
PY_CHECK_FUNC([getpagesize], [@%:@include <unistd.h>])
49434943

49444944
AC_CACHE_CHECK([for broken unsetenv], [ac_cv_broken_unsetenv],
49454945
[AC_COMPILE_IFELSE(
49464946
[AC_LANG_PROGRAM(
4947-
[#include <stdlib.h>],
4947+
[@%:@include <stdlib.h>],
49484948
[int res = unsetenv("DUMMY")])],
49494949
[ac_cv_broken_unsetenv=no],
49504950
[ac_cv_broken_unsetenv=yes]
@@ -5072,7 +5072,7 @@ PKG_CHECK_MODULES([LIBLZMA], [liblzma], [have_liblzma=yes], [
50725072
])
50735073

50745074
dnl PY_CHECK_NETDB_FUNC(FUNCTION)
5075-
AC_DEFUN([PY_CHECK_NETDB_FUNC], [PY_CHECK_FUNC([$1], [#include <netdb.h>])])
5075+
AC_DEFUN([PY_CHECK_NETDB_FUNC], [PY_CHECK_FUNC([$1], [@%:@include <netdb.h>])])
50765076

50775077
PY_CHECK_NETDB_FUNC([hstrerror])
50785078
dnl not available in WASI yet
@@ -5395,10 +5395,10 @@ AC_CHECK_MEMBERS([struct passwd.pw_gecos, struct passwd.pw_passwd], [], [], [[
53955395
#include <pwd.h>
53965396
]])
53975397
# Issue #21085: In Cygwin, siginfo_t does not have si_band field.
5398-
AC_CHECK_MEMBERS([siginfo_t.si_band], [], [], [[#include <signal.h>]])
5398+
AC_CHECK_MEMBERS([siginfo_t.si_band], [], [], [[@%:@include <signal.h>]])
53995399

54005400
AC_CACHE_CHECK([for time.h that defines altzone], [ac_cv_header_time_altzone], [
5401-
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <time.h>]], [[return altzone;]])],
5401+
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include <time.h>]], [[return altzone;]])],
54025402
[ac_cv_header_time_altzone=yes],
54035403
[ac_cv_header_time_altzone=no])
54045404
])
@@ -5408,7 +5408,7 @@ if test $ac_cv_header_time_altzone = yes; then
54085408
fi
54095409

54105410
AC_CACHE_CHECK([for addrinfo], [ac_cv_struct_addrinfo],
5411-
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <netdb.h>]], [[struct addrinfo a]])],
5411+
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include <netdb.h>]], [[struct addrinfo a]])],
54125412
[ac_cv_struct_addrinfo=yes],
54135413
[ac_cv_struct_addrinfo=no]))
54145414
if test $ac_cv_struct_addrinfo = yes; then
@@ -5418,7 +5418,7 @@ fi
54185418
AC_CACHE_CHECK([for sockaddr_storage], [ac_cv_struct_sockaddr_storage],
54195419
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
54205420
# include <sys/types.h>
5421-
# include <sys/socket.h>]], [[struct sockaddr_storage s]])],
5421+
@%:@ include <sys/socket.h>]], [[struct sockaddr_storage s]])],
54225422
[ac_cv_struct_sockaddr_storage=yes],
54235423
[ac_cv_struct_sockaddr_storage=no]))
54245424
if test $ac_cv_struct_sockaddr_storage = yes; then
@@ -5430,7 +5430,7 @@ AC_CACHE_CHECK([for sockaddr_alg], [ac_cv_struct_sockaddr_alg],
54305430
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
54315431
# include <sys/types.h>
54325432
# include <sys/socket.h>
5433-
# include <linux/if_alg.h>]], [[struct sockaddr_alg s]])],
5433+
@%:@ include <linux/if_alg.h>]], [[struct sockaddr_alg s]])],
54345434
[ac_cv_struct_sockaddr_alg=yes],
54355435
[ac_cv_struct_sockaddr_alg=no]))
54365436
if test $ac_cv_struct_sockaddr_alg = yes; then
@@ -5469,7 +5469,7 @@ PY_CHECK_FUNC([socketpair], [
54695469
# check if sockaddr has sa_len member
54705470
AC_CACHE_CHECK([if sockaddr has sa_len member], [ac_cv_struct_sockaddr_sa_len], [
54715471
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
5472-
#include <sys/socket.h>]], [[struct sockaddr x;
5472+
@%:@include <sys/socket.h>]], [[struct sockaddr x;
54735473
x.sa_len = 0;]])],
54745474
[ac_cv_struct_sockaddr_sa_len=yes], [ac_cv_struct_sockaddr_sa_len=no])
54755475
])
@@ -5803,7 +5803,7 @@ AS_VAR_IF([ac_cv_broken_sem_getvalue], [yes], [
58035803
)
58045804
])
58055805

5806-
AC_CHECK_DECLS([RTLD_LAZY, RTLD_NOW, RTLD_GLOBAL, RTLD_LOCAL, RTLD_NODELETE, RTLD_NOLOAD, RTLD_DEEPBIND, RTLD_MEMBER], [], [], [[#include <dlfcn.h>]])
5806+
AC_CHECK_DECLS([RTLD_LAZY, RTLD_NOW, RTLD_GLOBAL, RTLD_LOCAL, RTLD_NODELETE, RTLD_NOLOAD, RTLD_DEEPBIND, RTLD_MEMBER], [], [], [[@%:@include <dlfcn.h>]])
58075807

58085808
# determine what size digit to use for Python's longs
58095809
AC_MSG_CHECKING([digit size for Python's longs])
@@ -6020,7 +6020,7 @@ fi
60206020

60216021
# check for getc_unlocked and related locking functions
60226022
AC_CACHE_CHECK([for getc_unlocked() and friends], [ac_cv_have_getc_unlocked], [
6023-
AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>]], [[
6023+
AC_LINK_IFELSE([AC_LANG_PROGRAM([[@%:@include <stdio.h>]], [[
60246024
FILE *f = fopen("/dev/null", "r");
60256025
flockfile(f);
60266026
getc_unlocked(f);
@@ -6326,7 +6326,7 @@ fi
63266326

63276327
# Look for subsecond timestamps in struct stat
63286328
AC_CACHE_CHECK([for tv_nsec in struct stat], [ac_cv_stat_tv_nsec],
6329-
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/stat.h>]], [[
6329+
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include <sys/stat.h>]], [[
63306330
struct stat st;
63316331
st.st_mtim.tv_nsec = 1;
63326332
]])],
@@ -6340,7 +6340,7 @@ fi
63406340

63416341
# Look for BSD style subsecond timestamps in struct stat
63426342
AC_CACHE_CHECK([for tv_nsec2 in struct stat], [ac_cv_stat_tv_nsec2],
6343-
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/stat.h>]], [[
6343+
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include <sys/stat.h>]], [[
63446344
struct stat st;
63456345
st.st_mtimespec.tv_nsec = 1;
63466346
]])],
@@ -6483,7 +6483,7 @@ AC_CHECK_HEADERS([term.h], [], [], [
64836483

64846484
# On HP/UX 11.0, mvwdelch is a block with a return statement
64856485
AC_CACHE_CHECK([whether mvwdelch is an expression], [ac_cv_mvwdelch_is_expression],
6486-
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <curses.h>]], [[
6486+
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include <curses.h>]], [[
64876487
int rtn;
64886488
rtn = mvwdelch(0,0,0);
64896489
]])],
@@ -6527,7 +6527,7 @@ AC_DEFUN([PY_CHECK_CURSES_FUNC],
65276527
[py_var],
65286528
[AC_COMPILE_IFELSE(
65296529
[AC_LANG_PROGRAM(
6530-
[#include <curses.h>], [
6530+
[@%:@include <curses.h>], [
65316531
#ifndef $1
65326532
void *x=$1
65336533
#endif

0 commit comments

Comments
 (0)