summaryrefslogtreecommitdiff
path: root/qpid/cpp/src/qpid/broker/BrokerImportExport.h
diff options
context:
space:
mode:
Diffstat (limited to 'qpid/cpp/src/qpid/broker/BrokerImportExport.h')
-rw-r--r--qpid/cpp/src/qpid/broker/BrokerImportExport.h25
1 files changed, 9 insertions, 16 deletions
diff --git a/qpid/cpp/src/qpid/broker/BrokerImportExport.h b/qpid/cpp/src/qpid/broker/BrokerImportExport.h
index ee05788063..a767dadb87 100644
--- a/qpid/cpp/src/qpid/broker/BrokerImportExport.h
+++ b/qpid/cpp/src/qpid/broker/BrokerImportExport.h
@@ -20,23 +20,16 @@
* under the License.
*/
-#if defined(WIN32) && !defined(QPID_DECLARE_STATIC)
-# if defined(BROKER_EXPORT) || defined (qpidbroker_EXPORTS)
-# define QPID_BROKER_EXTERN __declspec(dllexport)
-# else
-# define QPID_BROKER_EXTERN __declspec(dllimport)
-# endif
-# ifdef _MSC_VER
-# define QPID_BROKER_CLASS_EXTERN
-# define QPID_BROKER_INLINE_EXTERN QPID_BROKER_EXTERN
-# else
-# define QPID_BROKER_CLASS_EXTERN QPID_BROKER_EXTERN
-# define QPID_BROKER_INLINE_EXTERN
-# endif
+#include "qpid/ImportExport.h"
+
+#if defined(BROKER_EXPORT) || defined (qpidbroker_EXPORTS)
+# define QPID_BROKER_EXTERN QPID_EXPORT
+# define QPID_BROKER_CLASS_EXTERN QPID_CLASS_EXPORT
+# define QPID_BROKER_INLINE_EXTERN QPID_INLINE_EXPORT
#else
-# define QPID_BROKER_EXTERN
-# define QPID_BROKER_CLASS_EXTERN
-# define QPID_BROKER_INLINE_EXTERN
+# define QPID_BROKER_EXTERN QPID_IMPORT
+# define QPID_BROKER_CLASS_EXTERN QPID_CLASS_IMPORT
+# define QPID_BROKER_INLINE_EXTERN QPID_INLINE_IMPORT
#endif
#endif