diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 4116d05ad80..e1ad98e781f 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -5,13 +5,24 @@
 	* src/valarray-inst.cc (__valarray_product): Remove explicit
 	instantiation. 
 
+2000-07-21  Benjamin Kosnik  <bkoz@purist.soma.redhat.com>
+
+        * src/stl-inst.cc: Change __sink_unused_warning to unsigned int
+        for alpha.
+
+        * testsuite/26_numerics/complex_inserters_extractors.cc (testall):
+        Change return type to void.
+        * testsuite/25_algorithms/lower_bound.cc: Add return values.
+	* testsuite/17_intro/header_ciso646.cc: Modify.
+        * bits/locale_facets.h: Add return values for the generic cases.
+
 2000-07-21  H.J. Lu  (hjl@gnu.org)
 
-	        * acinclude.m4: Include <features.h> for glibc testing.
-	        * aclocal.m4: Likewise.
+        * acinclude.m4: Include <features.h> for glibc testing.
+        * aclocal.m4: Likewise.
+
+        * configure: Rebuild.
 
-	        * configure: Rebuild.
-	
 2000-07-20  H.J. Lu  (hjl@gnu.org)
 
         * acinclude.m4: Change "#pragma system_header" to
diff --git a/libstdc++-v3/testsuite/17_intro/header_ciso646.cc b/libstdc++-v3/testsuite/17_intro/header_ciso646.cc
index c6c1e39a499..8e4369090b5 100644
--- a/libstdc++-v3/testsuite/17_intro/header_ciso646.cc
+++ b/libstdc++-v3/testsuite/17_intro/header_ciso646.cc
@@ -38,6 +38,8 @@ bool test01()
 {
   bool test = true;
 
+#if 0
+
 #ifdef and
   test = false;
 #endif
@@ -82,6 +84,8 @@ bool test01()
   test = false;
 #endif
 
+#endif
+
 #ifdef DEBUG_ASSERT
   assert(test);
 #endif