diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index ad9db7c662c..0237c4a421c 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2003-04-18  Loren J. Rittle  <ljrittle@acm.org>
+
+	* include/c_std/std_cmath.h (C99 FP capture): Only undefine said
+	C99 FP macros, if actually captured.
+
 2003-04-17  Benjamin Kosnik  <bkoz@redhat.com>
 
 	PR libstdc++/9555
diff --git a/libstdc++-v3/include/c_std/std_cmath.h b/libstdc++-v3/include/c_std/std_cmath.h
index 1264c4dba69..c9a88cfb794 100644
--- a/libstdc++-v3/include/c_std/std_cmath.h
+++ b/libstdc++-v3/include/c_std/std_cmath.h
@@ -646,10 +646,9 @@ namespace __gnu_cxx
      int 
      __capture_isunordered(_Tp __f1, _Tp __f2) 
      { return isunordered(__f1, __f2); }
-} 
-#endif /* _GLIBCPP_USE_C99_FP_MACROS_DYNAMIC */
-#endif
+}
 
+// Only undefine the C99 FP macros, if actually captured for namespace movement
 #undef fpclassify
 #undef isfinite
 #undef isinf
@@ -662,6 +661,8 @@ namespace __gnu_cxx
 #undef islessequal
 #undef islessgreater
 #undef isunordered
+#endif /* _GLIBCPP_USE_C99_FP_MACROS_DYNAMIC */
+#endif
 
 #if _GLIBCPP_USE_C99
 #if !_GLIBCPP_USE_C99_FP_MACROS_DYNAMIC