diff --git a/include/boost/config.hpp b/include/boost/config.hpp
index a9b8366c..b74654f9 100644
--- a/include/boost/config.hpp
+++ b/include/boost/config.hpp
@@ -318,14 +318,17 @@
 #       define BOOST_NO_HASH
 #       define BOOST_NO_TEMPLATED_ITERATOR_CONSTRUCTORS
 #       define BOOST_NO_STD_ALLOCATOR
-#ifndef _CPPLIB_VER
-        // Updated Dinkum library defines this, and provides
-        // its own min and max definitions.
-#       define BOOST_NO_STD_MIN_MAX
-#       undef min
-#       undef max
-#endif
-#       define NOMINMAX
+#       ifndef _CPPLIB_VER
+          // Updated Dinkum library defines this, and provides
+          // its own min and max definitions.
+#         define BOOST_NO_STD_MIN_MAX
+#         undef min
+#         undef max
+#       endif
+#       ifndef NOMINMAX
+          // avoid spurious NOMINMAX redefinition warning
+#         define NOMINMAX
+#       endif
 #     endif
 #     define BOOST_NO_STD_ITERATOR_TRAITS