Skip to content

Commit 4973f76

Browse files
bpo-34448: Improve output of usable wchar_t check (GH-8846)
(cherry picked from commit 3738fad) Co-authored-by: Michael Osipov <[email protected]>
1 parent c7f5435 commit 4973f76

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

configure

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14682,19 +14682,21 @@ fi
1468214682
$as_echo "$ac_cv_wchar_t_signed" >&6; }
1468314683
fi
1468414684

14685+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether wchar_t is usable" >&5
14686+
$as_echo_n "checking whether wchar_t is usable... " >&6; }
1468514687
# wchar_t is only usable if it maps to an unsigned type
1468614688
if test "$ac_cv_sizeof_wchar_t" -ge 2 \
1468714689
-a "$ac_cv_wchar_t_signed" = "no"
1468814690
then
14689-
HAVE_USABLE_WCHAR_T="yes"
1469014691

1469114692
$as_echo "#define HAVE_USABLE_WCHAR_T 1" >>confdefs.h
1469214693

14694+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
14695+
$as_echo "yes" >&6; }
1469314696
else
14694-
HAVE_USABLE_WCHAR_T="no usable wchar_t found"
14697+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
14698+
$as_echo "no" >&6; }
1469514699
fi
14696-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $HAVE_USABLE_WCHAR_T" >&5
14697-
$as_echo "$HAVE_USABLE_WCHAR_T" >&6; }
1469814700

1469914701
# check for endianness
1470014702
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5

configure.ac

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4621,19 +4621,19 @@ then
46214621
AC_MSG_RESULT($ac_cv_wchar_t_signed)
46224622
fi
46234623

4624+
AC_MSG_CHECKING(whether wchar_t is usable)
46244625
# wchar_t is only usable if it maps to an unsigned type
46254626
if test "$ac_cv_sizeof_wchar_t" -ge 2 \
46264627
-a "$ac_cv_wchar_t_signed" = "no"
46274628
then
4628-
HAVE_USABLE_WCHAR_T="yes"
46294629
AC_DEFINE(HAVE_USABLE_WCHAR_T, 1,
46304630
[Define if you have a useable wchar_t type defined in wchar.h; useable
46314631
means wchar_t must be an unsigned type with at least 16 bits. (see
46324632
Include/unicodeobject.h).])
4633+
AC_MSG_RESULT(yes)
46334634
else
4634-
HAVE_USABLE_WCHAR_T="no usable wchar_t found"
4635+
AC_MSG_RESULT(no)
46354636
fi
4636-
AC_MSG_RESULT($HAVE_USABLE_WCHAR_T)
46374637

46384638
# check for endianness
46394639
AC_C_BIGENDIAN

0 commit comments

Comments
 (0)