Skip to content

Commit 27c68a6

Browse files
erlend-aaslanderlend-aasland
authored
gh-89886: Use Autoconf quadrigraphs where appropriate (#105226)
1 parent 990cb36 commit 27c68a6

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

@@ -4445,7 +4445,7 @@ AC_ARG_ENABLE([ipv6],
44454445
dnl the check does not work on cross compilation case...
44464446
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ /* AF_INET6 available check */
44474447
#include <sys/types.h>
4448-
#include <sys/socket.h>]],
4448+
@%:@include <sys/socket.h>]],
44494449
[[int domain = AF_INET6;]])],[
44504450
ipv6=yes
44514451
],[
@@ -4462,7 +4462,7 @@ if test "$ipv6" = "yes"; then
44624462
AC_MSG_CHECKING([if RFC2553 API is available])
44634463
AC_COMPILE_IFELSE([
44644464
AC_LANG_PROGRAM([[#include <sys/types.h>
4465-
#include <netinet/in.h>]],
4465+
@%:@include <netinet/in.h>]],
44664466
[[struct sockaddr_in6 x;
44674467
x.sin6_scope_id;]])
44684468
],[
@@ -4494,7 +4494,7 @@ if test "$ipv6" = "yes"; then
44944494
#include <netinet/in.h>
44954495
#ifdef IPV6_INRIA_VERSION
44964496
yes
4497-
#endif],
4497+
@%:@endif],
44984498
[ipv6type=$i])
44994499
;;
45004500
kame)
@@ -4503,7 +4503,7 @@ yes
45034503
#include <netinet/in.h>
45044504
#ifdef __KAME__
45054505
yes
4506-
#endif],
4506+
@%:@endif],
45074507
[ipv6type=$i;
45084508
ipv6lib=inet6
45094509
ipv6libdir=/usr/local/v6/lib
@@ -4515,7 +4515,7 @@ yes
45154515
#include <features.h>
45164516
#if defined(__GLIBC__) && ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2))
45174517
yes
4518-
#endif],
4518+
@%:@endif],
45194519
[ipv6type=$i;
45204520
ipv6trylibc=yes])
45214521
;;
@@ -4541,7 +4541,7 @@ yes
45414541
#include <sys/param.h>
45424542
#ifdef _TOSHIBA_INET6
45434543
yes
4544-
#endif],
4544+
@%:@endif],
45454545
[ipv6type=$i;
45464546
ipv6lib=inet6;
45474547
ipv6libdir=/usr/local/v6/lib])
@@ -4551,7 +4551,7 @@ yes
45514551
#include </usr/local/v6/include/sys/v6config.h>
45524552
#ifdef __V6D__
45534553
yes
4554-
#endif],
4554+
@%:@endif],
45554555
[ipv6type=$i;
45564556
ipv6lib=v6;
45574557
ipv6libdir=/usr/local/v6/lib;
@@ -4562,7 +4562,7 @@ yes
45624562
#include <sys/param.h>
45634563
#ifdef _ZETA_MINAMI_INET6
45644564
yes
4565-
#endif],
4565+
@%:@endif],
45664566
[ipv6type=$i;
45674567
ipv6lib=inet6;
45684568
ipv6libdir=/usr/local/v6/lib])
@@ -4595,7 +4595,7 @@ fi
45954595

45964596
AC_CACHE_CHECK([CAN_RAW_FD_FRAMES], [ac_cv_can_raw_fd_frames], [
45974597
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ /* CAN_RAW_FD_FRAMES available check */
4598-
#include <linux/can/raw.h>]],
4598+
@%:@include <linux/can/raw.h>]],
45994599
[[int can_raw_fd_frames = CAN_RAW_FD_FRAMES;]])],
46004600
[ac_cv_can_raw_fd_frames=yes],
46014601
[ac_cv_can_raw_fd_frames=no])
@@ -4607,7 +4607,7 @@ AS_VAR_IF([ac_cv_can_raw_fd_frames], [yes], [
46074607

46084608
AC_CACHE_CHECK([for CAN_RAW_JOIN_FILTERS], [ac_cv_can_raw_join_filters], [
46094609
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
4610-
#include <linux/can/raw.h>]],
4610+
@%:@include <linux/can/raw.h>]],
46114611
[[int can_raw_join_filters = CAN_RAW_JOIN_FILTERS;]])],
46124612
[ac_cv_can_raw_join_filters=yes],
46134613
[ac_cv_can_raw_join_filters=no])
@@ -4854,14 +4854,14 @@ AC_CHECK_DECL([dirfd],
48544854

48554855
# For some functions, having a definition is not sufficient, since
48564856
# we want to take their address.
4857-
PY_CHECK_FUNC([chroot], [#include <unistd.h>])
4858-
PY_CHECK_FUNC([link], [#include <unistd.h>])
4859-
PY_CHECK_FUNC([symlink], [#include <unistd.h>])
4860-
PY_CHECK_FUNC([fchdir], [#include <unistd.h>])
4861-
PY_CHECK_FUNC([fsync], [#include <unistd.h>])
4862-
PY_CHECK_FUNC([fdatasync], [#include <unistd.h>])
4863-
PY_CHECK_FUNC([epoll_create], [#include <sys/epoll.h>], [HAVE_EPOLL])
4864-
PY_CHECK_FUNC([epoll_create1], [#include <sys/epoll.h>])
4857+
PY_CHECK_FUNC([chroot], [@%:@include <unistd.h>])
4858+
PY_CHECK_FUNC([link], [@%:@include <unistd.h>])
4859+
PY_CHECK_FUNC([symlink], [@%:@include <unistd.h>])
4860+
PY_CHECK_FUNC([fchdir], [@%:@include <unistd.h>])
4861+
PY_CHECK_FUNC([fsync], [@%:@include <unistd.h>])
4862+
PY_CHECK_FUNC([fdatasync], [@%:@include <unistd.h>])
4863+
PY_CHECK_FUNC([epoll_create], [@%:@include <sys/epoll.h>], [HAVE_EPOLL])
4864+
PY_CHECK_FUNC([epoll_create1], [@%:@include <sys/epoll.h>])
48654865
PY_CHECK_FUNC([kqueue],[
48664866
#include <sys/types.h>
48674867
#include <sys/event.h>
@@ -4871,7 +4871,7 @@ PY_CHECK_FUNC([prlimit], [
48714871
#include <sys/resource.h>
48724872
])
48734873

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

48764876
PY_CHECK_FUNC([memfd_create], [
48774877
#ifdef HAVE_SYS_MMAN_H
@@ -4894,12 +4894,12 @@ PY_CHECK_FUNC([eventfd], [
48944894
# address to avoid compiler warnings and potential miscompilations
48954895
# because of the missing prototypes.
48964896

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

48994899
AC_CACHE_CHECK([for flock declaration], [ac_cv_flock_decl],
49004900
[AC_COMPILE_IFELSE(
49014901
[AC_LANG_PROGRAM(
4902-
[#include <sys/file.h>],
4902+
[@%:@include <sys/file.h>],
49034903
[void* p = flock]
49044904
)],
49054905
[ac_cv_flock_decl=yes],
@@ -4911,12 +4911,12 @@ AS_VAR_IF([ac_cv_flock_decl], [yes],
49114911
[AC_CHECK_FUNCS([flock], [],
49124912
[AC_CHECK_LIB([bsd], [flock], [FCNTL_LIBS="-lbsd"])])])
49134913

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

49164916
AC_CACHE_CHECK([for broken unsetenv], [ac_cv_broken_unsetenv],
49174917
[AC_COMPILE_IFELSE(
49184918
[AC_LANG_PROGRAM(
4919-
[#include <stdlib.h>],
4919+
[@%:@include <stdlib.h>],
49204920
[int res = unsetenv("DUMMY")])],
49214921
[ac_cv_broken_unsetenv=no],
49224922
[ac_cv_broken_unsetenv=yes]
@@ -5044,7 +5044,7 @@ PKG_CHECK_MODULES([LIBLZMA], [liblzma], [have_liblzma=yes], [
50445044
])
50455045

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

50495049
PY_CHECK_NETDB_FUNC([hstrerror])
50505050
dnl not available in WASI yet
@@ -5325,10 +5325,10 @@ AC_CHECK_MEMBERS([struct passwd.pw_gecos, struct passwd.pw_passwd], [], [], [[
53255325
#include <pwd.h>
53265326
]])
53275327
# Issue #21085: In Cygwin, siginfo_t does not have si_band field.
5328-
AC_CHECK_MEMBERS([siginfo_t.si_band], [], [], [[#include <signal.h>]])
5328+
AC_CHECK_MEMBERS([siginfo_t.si_band], [], [], [[@%:@include <signal.h>]])
53295329

53305330
AC_CACHE_CHECK([for time.h that defines altzone], [ac_cv_header_time_altzone], [
5331-
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <time.h>]], [[return altzone;]])],
5331+
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include <time.h>]], [[return altzone;]])],
53325332
[ac_cv_header_time_altzone=yes],
53335333
[ac_cv_header_time_altzone=no])
53345334
])
@@ -5338,7 +5338,7 @@ if test $ac_cv_header_time_altzone = yes; then
53385338
fi
53395339

53405340
AC_CACHE_CHECK([for addrinfo], [ac_cv_struct_addrinfo],
5341-
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <netdb.h>]], [[struct addrinfo a]])],
5341+
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include <netdb.h>]], [[struct addrinfo a]])],
53425342
[ac_cv_struct_addrinfo=yes],
53435343
[ac_cv_struct_addrinfo=no]))
53445344
if test $ac_cv_struct_addrinfo = yes; then
@@ -5348,7 +5348,7 @@ fi
53485348
AC_CACHE_CHECK([for sockaddr_storage], [ac_cv_struct_sockaddr_storage],
53495349
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
53505350
# include <sys/types.h>
5351-
# include <sys/socket.h>]], [[struct sockaddr_storage s]])],
5351+
@%:@ include <sys/socket.h>]], [[struct sockaddr_storage s]])],
53525352
[ac_cv_struct_sockaddr_storage=yes],
53535353
[ac_cv_struct_sockaddr_storage=no]))
53545354
if test $ac_cv_struct_sockaddr_storage = yes; then
@@ -5360,7 +5360,7 @@ AC_CACHE_CHECK([for sockaddr_alg], [ac_cv_struct_sockaddr_alg],
53605360
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
53615361
# include <sys/types.h>
53625362
# include <sys/socket.h>
5363-
# include <linux/if_alg.h>]], [[struct sockaddr_alg s]])],
5363+
@%:@ include <linux/if_alg.h>]], [[struct sockaddr_alg s]])],
53645364
[ac_cv_struct_sockaddr_alg=yes],
53655365
[ac_cv_struct_sockaddr_alg=no]))
53665366
if test $ac_cv_struct_sockaddr_alg = yes; then
@@ -5399,7 +5399,7 @@ PY_CHECK_FUNC([socketpair], [
53995399
# check if sockaddr has sa_len member
54005400
AC_CACHE_CHECK([if sockaddr has sa_len member], [ac_cv_struct_sockaddr_sa_len], [
54015401
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
5402-
#include <sys/socket.h>]], [[struct sockaddr x;
5402+
@%:@include <sys/socket.h>]], [[struct sockaddr x;
54035403
x.sa_len = 0;]])],
54045404
[ac_cv_struct_sockaddr_sa_len=yes], [ac_cv_struct_sockaddr_sa_len=no])
54055405
])
@@ -5733,7 +5733,7 @@ AS_VAR_IF([ac_cv_broken_sem_getvalue], [yes], [
57335733
)
57345734
])
57355735

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

57385738
# determine what size digit to use for Python's longs
57395739
AC_MSG_CHECKING([digit size for Python's longs])
@@ -5950,7 +5950,7 @@ fi
59505950

59515951
# check for getc_unlocked and related locking functions
59525952
AC_CACHE_CHECK([for getc_unlocked() and friends], [ac_cv_have_getc_unlocked], [
5953-
AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>]], [[
5953+
AC_LINK_IFELSE([AC_LANG_PROGRAM([[@%:@include <stdio.h>]], [[
59545954
FILE *f = fopen("/dev/null", "r");
59555955
flockfile(f);
59565956
getc_unlocked(f);
@@ -6256,7 +6256,7 @@ fi
62566256

62576257
# Look for subsecond timestamps in struct stat
62586258
AC_CACHE_CHECK([for tv_nsec in struct stat], [ac_cv_stat_tv_nsec],
6259-
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/stat.h>]], [[
6259+
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include <sys/stat.h>]], [[
62606260
struct stat st;
62616261
st.st_mtim.tv_nsec = 1;
62626262
]])],
@@ -6270,7 +6270,7 @@ fi
62706270

62716271
# Look for BSD style subsecond timestamps in struct stat
62726272
AC_CACHE_CHECK([for tv_nsec2 in struct stat], [ac_cv_stat_tv_nsec2],
6273-
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/stat.h>]], [[
6273+
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include <sys/stat.h>]], [[
62746274
struct stat st;
62756275
st.st_mtimespec.tv_nsec = 1;
62766276
]])],
@@ -6413,7 +6413,7 @@ AC_CHECK_HEADERS([term.h], [], [], [
64136413

64146414
# On HP/UX 11.0, mvwdelch is a block with a return statement
64156415
AC_CACHE_CHECK([whether mvwdelch is an expression], [ac_cv_mvwdelch_is_expression],
6416-
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <curses.h>]], [[
6416+
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include <curses.h>]], [[
64176417
int rtn;
64186418
rtn = mvwdelch(0,0,0);
64196419
]])],
@@ -6457,7 +6457,7 @@ AC_DEFUN([PY_CHECK_CURSES_FUNC],
64576457
[py_var],
64586458
[AC_COMPILE_IFELSE(
64596459
[AC_LANG_PROGRAM(
6460-
[#include <curses.h>], [
6460+
[@%:@include <curses.h>], [
64616461
#ifndef $1
64626462
void *x=$1
64636463
#endif

0 commit comments

Comments
 (0)