Skip to content

Commit c054a3b

Browse files
committed
Merge 73299,73301,73308 from ^/trunk
------------------------------------------------------------------------ r73299 | jhunold | 2011-07-22 14:08:03 +0200 (Fr, 22 Jul 2011) | 2 lines Enable visibility support. Refs #2114. ------------------------------------------------------------------------ r73301 | jhunold | 2011-07-22 16:15:45 +0200 (Fr, 22 Jul 2011) | 2 lines Enable visibility support. Refs #2114. ------------------------------------------------------------------------ r73308 | jhunold | 2011-07-23 11:24:35 +0200 (Sa, 23 Jul 2011) | 2 lines Enable visibility support. Refs #2114. ------------------------------------------------------------------------ [SVN r73381]
1 parent cf09cfd commit c054a3b

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

include/boost/program_options/config.hpp

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,17 +34,14 @@
3434
#endif // BOOST_VERSION
3535

3636
///////////////////////////////////////////////////////////////////////////////
37-
// Windows DLL suport
38-
#ifdef BOOST_HAS_DECLSPEC
3937
#if defined(BOOST_ALL_DYN_LINK) || defined(BOOST_PROGRAM_OPTIONS_DYN_LINK)
4038
// export if this is our own source, otherwise import:
4139
#ifdef BOOST_PROGRAM_OPTIONS_SOURCE
42-
# define BOOST_PROGRAM_OPTIONS_DECL __declspec(dllexport)
40+
# define BOOST_PROGRAM_OPTIONS_DECL BOOST_SYMBOL_EXPORT
4341
#else
44-
# define BOOST_PROGRAM_OPTIONS_DECL __declspec(dllimport)
42+
# define BOOST_PROGRAM_OPTIONS_DECL BOOST_SYMBOL_IMPORT
4543
#endif // BOOST_PROGRAM_OPTIONS_SOURCE
4644
#endif // DYN_LINK
47-
#endif // BOOST_HAS_DECLSPEC
4845

4946
#ifndef BOOST_PROGRAM_OPTIONS_DECL
5047
#define BOOST_PROGRAM_OPTIONS_DECL

0 commit comments

Comments
 (0)