Skip to content

Commit 3738fad

Browse files
michael-oberkerpeksag
authored andcommitted
bpo-34448: Improve output of usable wchar_t check (GH-8846)
1 parent 4988453 commit 3738fad

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
@@ -14600,19 +14600,21 @@ fi
1460014600
$as_echo "$ac_cv_wchar_t_signed" >&6; }
1460114601
fi
1460214602

14603+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether wchar_t is usable" >&5
14604+
$as_echo_n "checking whether wchar_t is usable... " >&6; }
1460314605
# wchar_t is only usable if it maps to an unsigned type
1460414606
if test "$ac_cv_sizeof_wchar_t" -ge 2 \
1460514607
-a "$ac_cv_wchar_t_signed" = "no"
1460614608
then
14607-
HAVE_USABLE_WCHAR_T="yes"
1460814609

1460914610
$as_echo "#define HAVE_USABLE_WCHAR_T 1" >>confdefs.h
1461014611

14612+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
14613+
$as_echo "yes" >&6; }
1461114614
else
14612-
HAVE_USABLE_WCHAR_T="no usable wchar_t found"
14615+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
14616+
$as_echo "no" >&6; }
1461314617
fi
14614-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $HAVE_USABLE_WCHAR_T" >&5
14615-
$as_echo "$HAVE_USABLE_WCHAR_T" >&6; }
1461614618

1461714619
# check for endianness
1461814620
{ $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
@@ -4555,19 +4555,19 @@ then
45554555
AC_MSG_RESULT($ac_cv_wchar_t_signed)
45564556
fi
45574557

4558+
AC_MSG_CHECKING(whether wchar_t is usable)
45584559
# wchar_t is only usable if it maps to an unsigned type
45594560
if test "$ac_cv_sizeof_wchar_t" -ge 2 \
45604561
-a "$ac_cv_wchar_t_signed" = "no"
45614562
then
4562-
HAVE_USABLE_WCHAR_T="yes"
45634563
AC_DEFINE(HAVE_USABLE_WCHAR_T, 1,
45644564
[Define if you have a useable wchar_t type defined in wchar.h; useable
45654565
means wchar_t must be an unsigned type with at least 16 bits. (see
45664566
Include/unicodeobject.h).])
4567+
AC_MSG_RESULT(yes)
45674568
else
4568-
HAVE_USABLE_WCHAR_T="no usable wchar_t found"
4569+
AC_MSG_RESULT(no)
45694570
fi
4570-
AC_MSG_RESULT($HAVE_USABLE_WCHAR_T)
45714571

45724572
# check for endianness
45734573
AC_C_BIGENDIAN

0 commit comments

Comments
 (0)