codecvt_wchar_t_char.cc (main): Add _GLIBCPP_USE_WCHAR_T guards.

2000-11-24  Benjamin Kosnik  <bkoz@purist.soma.redhat.com>

	* testsuite/22_locale/codecvt_wchar_t_char.cc (main): Add
	_GLIBCPP_USE_WCHAR_T guards.

	* configure.in (AC_OUTPUT_COMMANDS): Remove, just run scripts as
	is, so that checks for existence of generated files actually work.
	* configure: Regenerate.

From-SVN: r37723

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 0f6c3fdb1833f63a5805a304a9c45d5ba0246d4c..6a1ecb68d35e63fe5fb4e60fc36563406f57522d 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,12 @@
+2000-11-24  Benjamin Kosnik  <bkoz@purist.soma.redhat.com>
+
+       * testsuite/22_locale/codecvt_wchar_t_char.cc (main): Add
+       _GLIBCPP_USE_WCHAR_T guards.
+
+       * configure.in (AC_OUTPUT_COMMANDS): Remove, just run scripts as
+       is, so that checks for existence of generated files actually work.
+       * configure: Regenerate.
+
 2000-11-23  Hans-Peter Nilsson  <hp@bitrange.com>
 
        * config/os/gnu-linux/bits/os_defines.h: Include <features.h>.

diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
index d026a24786d76f907ddf9130756675c85a50affd..0f4dc49b8f0df90eff2ff50aeb197a3dbc5428bb 100755 (executable)
--- a/libstdc++-v3/configure
+++ b/libstdc++-v3/configure
@@ -19337,11 +19337,11 @@ test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
 
 # Generate bits/c++config.h
 # NB: This must be the first generated file as others include it. . .
-
+$srcdir/mkc++config $blddir $srcdir
 
 # Generate bits/std_limits.h and src/limitsMEMBERS.cc
 if test ! -f stamp-limits; then
-  
+  $srcdir/mknumeric_limits $blddir $srcdir $xcompiling
   touch stamp-limits
 fi
 
@@ -19370,7 +19370,7 @@ if test ! -f stamp-sanity-warned; then
 fi
 
 
-$srcdir/mkc++config $blddir $srcdir
-$srcdir/mknumeric_limits $blddir $srcdir $xcompiling
+
+
 
 

diff --git a/libstdc++-v3/configure.in b/libstdc++-v3/configure.in
index 4cba0f682327ce90919c81f3bd0b3771852a3b1e..8c6d232f1553e55568f9a6646740b30981c26e67 100644 (file)
--- a/libstdc++-v3/configure.in
+++ b/libstdc++-v3/configure.in
@@ -247,11 +247,11 @@ CXX="${CXX}"
 
 # Generate bits/c++config.h
 # NB: This must be the first generated file as others include it. . .
-AC_OUTPUT_COMMANDS([$srcdir/mkc++config $blddir $srcdir])
+$srcdir/mkc++config $blddir $srcdir
 
 # Generate bits/std_limits.h and src/limitsMEMBERS.cc
 if test ! -f stamp-limits; then
-  AC_OUTPUT_COMMANDS([$srcdir/mknumeric_limits $blddir $srcdir $xcompiling])
+  $srcdir/mknumeric_limits $blddir $srcdir $xcompiling
   touch stamp-limits
 fi
 
@@ -280,3 +280,7 @@ if test ! -f stamp-sanity-warned; then
 fi
 
 
+
+
+
+

diff --git a/libstdc++-v3/testsuite/22_locale/codecvt_wchar_t_char.cc b/libstdc++-v3/testsuite/22_locale/codecvt_wchar_t_char.cc
index 91505beef2717d050efc7b2fa9f8c5f1a80333c4..3f7c83bcb399000657420272d377e2ee4d0fa1ee 100644 (file)
--- a/libstdc++-v3/testsuite/22_locale/codecvt_wchar_t_char.cc
+++ b/libstdc++-v3/testsuite/22_locale/codecvt_wchar_t_char.cc
@@ -34,6 +34,7 @@
 // or, can use this explicit "C" initialization:
 //   w_codecvt::state_type state01 = {0, 0};
 // .. except Ulrich says: Use memset. Always use memset. Feel the force...
+#ifdef _GLIBCPP_USE_WCHAR_T
 void
 zero_state(std::mbstate_t& state)
 { std::memset(&state, 0, sizeof(std::mbstate_t)); }
@@ -109,10 +110,14 @@ void test01()
   delete [] e_arr;
   delete [] i_arr;
 }
+#endif /* !defined(_GLIBCPP_USE_WCHAR_T) */
+
 
 int main ()
 {
+#if _GLIBCPP_USE_WCHAR_T
   test01();
+#endif 
 
   return 0;
 }