diff --git a/include/boost/config/compiler/comeau.hpp b/include/boost/config/compiler/comeau.hpp
index 008acff8..16a1b93c 100644
--- a/include/boost/config/compiler/comeau.hpp
+++ b/include/boost/config/compiler/comeau.hpp
@@ -33,14 +33,6 @@
 
 #endif  // version 4245
 
-#if (__COMO_VERSION__ <= 4303) || !defined(BOOST_STRICT_CONFIG)
-
-#ifdef _WIN32
-#  define BOOST_NO_SWPRINTF
-#endif
-
-#endif // Version 4303
-
 //
 // enable __int64 support in VC emulation mode
 //
diff --git a/include/boost/config/stdlib/libcomo.hpp b/include/boost/config/stdlib/libcomo.hpp
index 3de143d3..b2c8e440 100644
--- a/include/boost/config/stdlib/libcomo.hpp
+++ b/include/boost/config/stdlib/libcomo.hpp
@@ -24,6 +24,10 @@
 #  define BOOST_NO_STD_WSTREAMBUF
 #endif
 
+#if (__LIBCOMO_VERSION__ <= 31) && defined(_WIN32)
+#define BOOST_NO_SWPRINTF
+#endif
+
 #if __LIBCOMO_VERSION__ >= 31
 #  define BOOST_HAS_HASH
 #  define BOOST_HAS_SLIST