From d0258375aef5008d4ed9d09a99552ee728800a2e Mon Sep 17 00:00:00 2001 From: John Maddock Date: Thu, 13 Nov 2003 12:17:49 +0000 Subject: [PATCH] Added support for BOOST_ALL_DYN_LINK [SVN r20802] --- include/boost/regex/config.hpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/boost/regex/config.hpp b/include/boost/regex/config.hpp index 3b48dcdc..7b4211db 100644 --- a/include/boost/regex/config.hpp +++ b/include/boost/regex/config.hpp @@ -206,7 +206,7 @@ namespace boost{ typedef wchar_t regex_wchar_type; } * ****************************************************************************/ -#if defined(BOOST_HAS_DECLSPEC) && defined(BOOST_REGEX_DYN_LINK) && !defined(BOOST_REGEX_STATIC_LINK) +#if defined(BOOST_HAS_DECLSPEC) && (defined(BOOST_REGEX_DYN_LINK) || defined(BOOST_ALL_DYN_LINK)) && !defined(BOOST_REGEX_STATIC_LINK) # if defined(BOOST_REGEX_SOURCE) # define BOOST_REGEX_DECL __declspec(dllexport) # define BOOST_REGEX_BUILD_DLL @@ -219,9 +219,9 @@ namespace boost{ typedef wchar_t regex_wchar_type; } # define BOOST_REGEX_DECL #endif -#if (defined(BOOST_MSVC) || defined(__BORLANDC__)) && !defined(BOOST_REGEX_NO_LIB) && !defined(BOOST_REGEX_SOURCE) +#if (defined(BOOST_MSVC) || defined(__BORLANDC__)) && !defined(BOOST_REGEX_NO_LIB) && !defined(BOOST_REGEX_SOURCE) && !defined(BOOST_ALL_NO_LIB) # define BOOST_LIB_NAME boost_regex -# ifdef BOOST_REGEX_DYN_LINK +# if defined(BOOST_REGEX_DYN_LINK) || defined(BOOST_ALL_DYN_LINK) # define BOOST_DYN_LINK # endif #ifdef BOOST_REGEX_DIAG