diff options
| author | Alan Conway <aconway@apache.org> | 2011-07-28 18:28:56 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2011-07-28 18:28:56 +0000 |
| commit | 95ad2adfc443b227eba224279188c36906c1db66 (patch) | |
| tree | 14c91400e2284b2c4f782d203a60d44dbee31f9e /qpid/cpp/src/qpid/broker/BrokerImportExport.h | |
| parent | 8db25489a2971803b21d73814521b40731111bd5 (diff) | |
| download | qpid-python-qpid-3163.tar.gz | |
Merge branch 'visibility-hidden' into qpid-3163qpid-3163
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/qpid-3163@1151956 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/qpid/broker/BrokerImportExport.h')
| -rw-r--r-- | qpid/cpp/src/qpid/broker/BrokerImportExport.h | 25 |
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 |