Skip to content

R
riscv-gcc-1
Commit 68fe6226 by Benjamin Kosnik Committed by Benjamin Kosnik
Options

std_cwchar.h: Alphabetize. 


2001-06-10  Benjamin Kosnik  <bkoz@redhat.com>

	* include/c_std/bits/std_cwchar.h: Alphabetize.
	* include/bits/char_traits.h: Tweak.
	* acinclude.m4 (GLIBCPP_CHECK_WCHAR_T_SUPPORT): Check for
	everything used by std_cwchar.h.
	* aclocal.m4: Regenerate.
	* configure.in: Regenerate.
	* config.h.in: Regenerate.

From-SVN: r43167
parent ad5ef673
Showing with 234 additions and 73 deletions
libstdc++-v3/ChangeLog
2001-06-10 Benjamin Kosnik <bkoz@redhat.com>
* include/c_std/bits/std_cwchar.h: Alphabetize.
* include/bits/char_traits.h: Tweak.
* acinclude.m4 (GLIBCPP_CHECK_WCHAR_T_SUPPORT): Check for
everything used by std_cwchar.h.
* aclocal.m4: Regenerate.
* configure.in: Regenerate.
* config.h.in: Regenerate.
2001-06-10 Benjamin Kosnik <bkoz@redhat.com>
* acinclude.m4 (GLIBCPP_ENABLE_C99): Add stdio.h checking.
Add checking for strtof, _Exit in stdlib.h
* aclocal.m4: Regenerate.
......
libstdc++-v3/acinclude.m4
......@@ -813,11 +813,18 @@ AC_DEFUN(GLIBCPP_CHECK_WCHAR_T_SUPPORT, [
AC_MSG_RESULT($has_weof)
dnl Tests for wide character functions used in char_traits<wchar_t>.
AC_CHECK_FUNCS(wcslen wmemchr wmemcmp wmemcpy wmemmove wmemset \
wcsrtombs mbsrtowcs, ac_wfuncs=yes, ac_wfuncs=no)
ac_wfuncs=yes
AC_CHECK_FUNCS(wcslen wmemchr wmemcmp wmemcpy wmemmove wmemset,, \
ac_wfuncs=no)
dnl Do quick checks for things injected into std:: by the c_std headers.
AC_CHECK_FUNCS(fgetwc, fgetws)
dnl Checks for names injected into std:: by the c_std headers.
AC_CHECK_FUNCS(btowc wctob fgetwc fgetwc fgetws fputwc fputws fwide \
fwprintf fwscanf swprintf swscanf vfwprintf vfwscanf vswprintf vswscanf \
vwprintf vwscanf wprintf wscanf getwc getwchar mbsinit mbrlen mbrtowc \
mbsrtowcs wcsrtombs putwc putwchar ungetwc wcrtomb wcstod wcstof wcstol \
wcstoul wcscpy wcsncpy wcscat wcsncat wcscmp wcscoll wcsncmp wcsxfrm \
wcscspn wcsspn wcstok wcsftime wcschr wcspbrk wcsrchr wcsstr,, \
ac_wfuncs=no)
AC_MSG_CHECKING([for ISO C99 wchar_t support])
if test x"$has_weof" = xyes && test x"$has_wchar_minmax" = xyes \
......@@ -856,7 +863,7 @@ AC_DEFUN(GLIBCPP_CHECK_WCHAR_T_SUPPORT, [
dnl above support is present.
AC_MSG_CHECKING([for enabled wchar_t specializations])
if test x"$ac_isoC99_wchar_t" = xyes \
&& test x"$ac_XPG2_wchar_t" = xyes; then
&& test x"$ac_XPG2_wchar_t" = xyes; then
AC_DEFINE(_GLIBCPP_USE_WCHAR_T)
AC_MSG_RESULT("yes")
else
......@@ -1327,8 +1334,9 @@ AC_DEFUN(GLIBCPP_ENABLE_C99, [dnl
AC_MSG_RESULT($ac_c99_stdlib)
# Check for the existence of <wchar.h> functions used if C99 is enabled.
# XXX the wchar.h checks should be rolled into the general C99 bits.
ac_c99_wchar=yes;
AC_MSG_CHECKING([for ISO C99 support in <wchar.h>])
AC_MSG_CHECKING([for additional ISO C99 support in <wchar.h>])
AC_TRY_COMPILE([#include <wchar.h>],
[wcstold(L"10.0", NULL);],, [ac_c99_wchar=no])
AC_TRY_COMPILE([#include <wchar.h>],
......@@ -1339,8 +1347,8 @@ AC_DEFUN(GLIBCPP_ENABLE_C99, [dnl
AC_MSG_CHECKING([for enabled ISO C99 support])
if test x"$ac_c99_math" = x"no" || test x"$ac_c99_stdio" = x"no" \
|| test x"$ac_c99_stdlib" = x"no" \
|| test x"$ac_c99_wchar" = x"no"; then
|| test x"$ac_c99_stdlib" = x"no" \
|| test x"$ac_c99_wchar" = x"no"; then
enable_c99=no;
fi;
AC_MSG_RESULT($enable_c99)
......
libstdc++-v3/aclocal.m4
......@@ -825,11 +825,18 @@ AC_DEFUN(GLIBCPP_CHECK_WCHAR_T_SUPPORT, [
AC_MSG_RESULT($has_weof)
dnl Tests for wide character functions used in char_traits<wchar_t>.
AC_CHECK_FUNCS(wcslen wmemchr wmemcmp wmemcpy wmemmove wmemset \
wcsrtombs mbsrtowcs, ac_wfuncs=yes, ac_wfuncs=no)
ac_wfuncs=yes
AC_CHECK_FUNCS(wcslen wmemchr wmemcmp wmemcpy wmemmove wmemset,, \
ac_wfuncs=no)
dnl Do quick checks for things injected into std:: by the c_std headers.
AC_CHECK_FUNCS(fgetwc, fgetws)
dnl Checks for names injected into std:: by the c_std headers.
AC_CHECK_FUNCS(btowc wctob fgetwc fgetwc fgetws fputwc fputws fwide \
fwprintf fwscanf swprintf swscanf vfwprintf vfwscanf vswprintf vswscanf \
vwprintf vwscanf wprintf wscanf getwc getwchar mbsinit mbrlen mbrtowc \
mbsrtowcs wcsrtombs putwc putwchar ungetwc wcrtomb wcstod wcstof wcstol \
wcstoul wcscpy wcsncpy wcscat wcsncat wcscmp wcscoll wcsncmp wcsxfrm \
wcscspn wcsspn wcstok wcsftime wcschr wcspbrk wcsrchr wcsstr,, \
ac_wfuncs=no)
AC_MSG_CHECKING([for ISO C99 wchar_t support])
if test x"$has_weof" = xyes && test x"$has_wchar_minmax" = xyes \
......@@ -868,7 +875,7 @@ AC_DEFUN(GLIBCPP_CHECK_WCHAR_T_SUPPORT, [
dnl above support is present.
AC_MSG_CHECKING([for enabled wchar_t specializations])
if test x"$ac_isoC99_wchar_t" = xyes \
&& test x"$ac_XPG2_wchar_t" = xyes; then
&& test x"$ac_XPG2_wchar_t" = xyes; then
AC_DEFINE(_GLIBCPP_USE_WCHAR_T)
AC_MSG_RESULT("yes")
else
......@@ -1339,8 +1346,9 @@ AC_DEFUN(GLIBCPP_ENABLE_C99, [dnl
AC_MSG_RESULT($ac_c99_stdlib)
# Check for the existence of <wchar.h> functions used if C99 is enabled.
# XXX the wchar.h checks should be rolled into the general C99 bits.
ac_c99_wchar=yes;
AC_MSG_CHECKING([for ISO C99 support in <wchar.h>])
AC_MSG_CHECKING([for additional ISO C99 support in <wchar.h>])
AC_TRY_COMPILE([#include <wchar.h>],
[wcstold(L"10.0", NULL);],, [ac_c99_wchar=no])
AC_TRY_COMPILE([#include <wchar.h>],
......@@ -1351,8 +1359,8 @@ AC_DEFUN(GLIBCPP_ENABLE_C99, [dnl
AC_MSG_CHECKING([for enabled ISO C99 support])
if test x"$ac_c99_math" = x"no" || test x"$ac_c99_stdio" = x"no" \
|| test x"$ac_c99_stdlib" = x"no" \
|| test x"$ac_c99_wchar" = x"no"; then
|| test x"$ac_c99_stdlib" = x"no" \
|| test x"$ac_c99_wchar" = x"no"; then
enable_c99=no;
fi;
AC_MSG_RESULT($enable_c99)
......
libstdc++-v3/config.h.in
......@@ -273,6 +273,9 @@
/* Define if you have the atanl function. */
#undef HAVE_ATANL
/* Define if you have the btowc function. */
#undef HAVE_BTOWC
/* Define if you have the ceilf function. */
#undef HAVE_CEILF
......@@ -318,6 +321,9 @@
/* Define if you have the fgetwc function. */
#undef HAVE_FGETWC
/* Define if you have the fgetws function. */
#undef HAVE_FGETWS
/* Define if you have the finite function. */
#undef HAVE_FINITE
......@@ -342,15 +348,36 @@
/* Define if you have the fpclass function. */
#undef HAVE_FPCLASS
/* Define if you have the fputwc function. */
#undef HAVE_FPUTWC
/* Define if you have the fputws function. */
#undef HAVE_FPUTWS
/* Define if you have the frexpf function. */
#undef HAVE_FREXPF
/* Define if you have the frexpl function. */
#undef HAVE_FREXPL
/* Define if you have the fwide function. */
#undef HAVE_FWIDE
/* Define if you have the fwprintf function. */
#undef HAVE_FWPRINTF
/* Define if you have the fwscanf function. */
#undef HAVE_FWSCANF
/* Define if you have the getpagesize function. */
#undef HAVE_GETPAGESIZE
/* Define if you have the getwc function. */
#undef HAVE_GETWC
/* Define if you have the getwchar function. */
#undef HAVE_GETWCHAR
/* Define if you have the hypot function. */
#undef HAVE_HYPOT
......@@ -405,6 +432,15 @@
/* Define if you have the logl function. */
#undef HAVE_LOGL
/* Define if you have the mbrlen function. */
#undef HAVE_MBRLEN
/* Define if you have the mbrtowc function. */
#undef HAVE_MBRTOWC
/* Define if you have the mbsinit function. */
#undef HAVE_MBSINIT
/* Define if you have the mbsrtowcs function. */
#undef HAVE_MBSRTOWCS
......@@ -426,6 +462,12 @@
/* Define if you have the powl function. */
#undef HAVE_POWL
/* Define if you have the putwc function. */
#undef HAVE_PUTWC
/* Define if you have the putwchar function. */
#undef HAVE_PUTWCHAR
/* Define if you have the qfpclass function. */
#undef HAVE_QFPCLASS
......@@ -462,6 +504,12 @@
/* Define if you have the strtold function. */
#undef HAVE_STRTOLD
/* Define if you have the swprintf function. */
#undef HAVE_SWPRINTF
/* Define if you have the swscanf function. */
#undef HAVE_SWSCANF
/* Define if you have the tanf function. */
#undef HAVE_TANF
......@@ -474,12 +522,99 @@
/* Define if you have the tanl function. */
#undef HAVE_TANL
/* Define if you have the ungetwc function. */
#undef HAVE_UNGETWC
/* Define if you have the vfwprintf function. */
#undef HAVE_VFWPRINTF
/* Define if you have the vfwscanf function. */
#undef HAVE_VFWSCANF
/* Define if you have the vswprintf function. */
#undef HAVE_VSWPRINTF
/* Define if you have the vswscanf function. */
#undef HAVE_VSWSCANF
/* Define if you have the vwprintf function. */
#undef HAVE_VWPRINTF
/* Define if you have the vwscanf function. */
#undef HAVE_VWSCANF
/* Define if you have the wcrtomb function. */
#undef HAVE_WCRTOMB
/* Define if you have the wcscat function. */
#undef HAVE_WCSCAT
/* Define if you have the wcschr function. */
#undef HAVE_WCSCHR
/* Define if you have the wcscmp function. */
#undef HAVE_WCSCMP
/* Define if you have the wcscoll function. */
#undef HAVE_WCSCOLL
/* Define if you have the wcscpy function. */
#undef HAVE_WCSCPY
/* Define if you have the wcscspn function. */
#undef HAVE_WCSCSPN
/* Define if you have the wcsftime function. */
#undef HAVE_WCSFTIME
/* Define if you have the wcslen function. */
#undef HAVE_WCSLEN
/* Define if you have the wcsncat function. */
#undef HAVE_WCSNCAT
/* Define if you have the wcsncmp function. */
#undef HAVE_WCSNCMP
/* Define if you have the wcsncpy function. */
#undef HAVE_WCSNCPY
/* Define if you have the wcspbrk function. */
#undef HAVE_WCSPBRK
/* Define if you have the wcsrchr function. */
#undef HAVE_WCSRCHR
/* Define if you have the wcsrtombs function. */
#undef HAVE_WCSRTOMBS
/* Define if you have the wcsspn function. */
#undef HAVE_WCSSPN
/* Define if you have the wcsstr function. */
#undef HAVE_WCSSTR
/* Define if you have the wcstod function. */
#undef HAVE_WCSTOD
/* Define if you have the wcstof function. */
#undef HAVE_WCSTOF
/* Define if you have the wcstok function. */
#undef HAVE_WCSTOK
/* Define if you have the wcstol function. */
#undef HAVE_WCSTOL
/* Define if you have the wcstoul function. */
#undef HAVE_WCSTOUL
/* Define if you have the wcsxfrm function. */
#undef HAVE_WCSXFRM
/* Define if you have the wctob function. */
#undef HAVE_WCTOB
/* Define if you have the wmemchr function. */
#undef HAVE_WMEMCHR
......@@ -495,6 +630,12 @@
/* Define if you have the wmemset function. */
#undef HAVE_WMEMSET
/* Define if you have the wprintf function. */
#undef HAVE_WPRINTF
/* Define if you have the wscanf function. */
#undef HAVE_WSCANF
/* Define if you have the <endian.h> header file. */
#undef HAVE_ENDIAN_H
......
libstdc++-v3/configure
This source diff could not be displayed because it is too large. You can view the blob instead.
libstdc++-v3/include/bits/char_traits.h
......@@ -270,7 +270,6 @@ namespace std
bool
operator()(_CharT const& __a) { return _Traits::eq(_M_c, __a); }
};
} // namespace std
#endif
libstdc++-v3/include/c_std/bits/std_cwchar.h
......@@ -61,8 +61,6 @@ namespace std
// Get rid of those macros defined in <wchar.h> in lieu of real functions.
#undef btowc
#undef wctob
#undef fgetwc
#undef fgetwc
#undef fgetws
#undef fputwc
......@@ -70,53 +68,54 @@ namespace std
#undef fwide
#undef fwprintf
#undef fwscanf
#undef swprintf
#undef swscanf
#undef vfwprintf
#undef vfwscanf
#undef vswprintf
#undef vswscanf
#undef vwprintf
#undef vwscanf
#undef wprintf
#undef wscanf
#undef getwc
#undef getwchar
#undef mbsinit
#undef mbrlen
#undef mbrtowc
#undef mbsinit
#undef mbsrtowcs
#undef wcsrtombs
#undef putwc
#undef putwchar
#undef swprintf
#undef swscanf
#undef ungetwc
#undef vfwprintf
#undef vfwscanf
#undef vswprintf
#undef vswscanf
#undef vwprintf
#undef vwscanf
#undef wcrtomb
#undef wcstod
#undef wcstof
#undef wcstol
#undef wcstoul
#undef wcscpy
#undef wcsncpy
#undef wcscat
#undef wcsncat
#undef wcschr
#undef wcscmp
#undef wcscoll
#undef wcsncmp
#undef wcsxfrm
#undef wcscpy
#undef wcscspn
#undef wcsftime
#undef wcslen
#undef wcsncat
#undef wcsncmp
#undef wcsncpy
#undef wcspbrk
#undef wcsrchr
#undef wcsrtombs
#undef wcsspn
#undef wcsstr
#undef wcstod
#undef wcstof
#undef wcstok
#undef wcstol
#undef wcstoul
#undef wcsxfrm
#undef wctob
#undef wmemchr
#undef wmemcmp
#undef wmemcpy
#undef wmemmove
#undef wmemset
#undef wcsftime
#undef wcschr
#undef wcspbrk
#undef wcsrchr
#undef wcsstr
#undef wmemchr
#undef wprintf
#undef wscanf
#if _GLIBCPP_USE_WCHAR_T
namespace std
......@@ -124,60 +123,56 @@ namespace std
using ::wint_t;
using ::btowc;
using ::wctob;
#if _GLIBCPP_HAVE_FGETWC
using ::fgetwc;
#endif
#if _GLIBCPP_HAVE_FGETWS
using ::fgetws;
#endif
using ::fputwc;
using ::fputws;
using ::fwide;
using ::fwprintf;
using ::fwscanf;
using ::swprintf;
using ::swscanf;
using ::vfwprintf;
using ::vfwscanf;
using ::vswprintf;
using ::vswscanf;
using ::vwprintf;
using ::vwscanf;
using ::wprintf;
using ::wscanf;
using ::getwc;
using ::getwchar;
using ::mbsinit;
using ::mbrlen;
using ::mbrtowc;
using ::mbsinit;
using ::mbsrtowcs;
using ::wcsrtombs;
using ::putwc;
using ::putwchar;
using ::swprintf;
using ::swscanf;
using ::ungetwc;
using ::vfwprintf;
using ::vfwscanf;
using ::vswprintf;
using ::vswscanf;
using ::vwprintf;
using ::vwscanf;
using ::wcrtomb;
using ::wcstod;
using ::wcstof;
using ::wcstol;
using ::wcstoul;
using ::wcscpy;
using ::wcsncpy;
using ::wcscat;
using ::wcsncat;
using ::wcscmp;
using ::wcscoll;
using ::wcsncmp;
using ::wcsxfrm;
using ::wcscpy;
using ::wcscspn;
using ::wcsftime;
using ::wcslen;
using ::wcsncat;
using ::wcsncmp;
using ::wcsncpy;
using ::wcsrtombs;
using ::wcsspn;
using ::wcstod;
using ::wcstof;
using ::wcstok;
using ::wcstol;
using ::wcstoul;
using ::wcsxfrm;
using ::wctob;
using ::wmemcmp;
using ::wmemcpy;
using ::wmemmove;
using ::wmemset;
using ::wcsftime;
using ::wprintf;
using ::wscanf;
using ::wcschr;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment