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/include/qmf | |
| 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/include/qmf')
| -rw-r--r-- | qpid/cpp/include/qmf/Subscription.h | 4 | ||||
| -rw-r--r-- | qpid/cpp/include/qmf/engine/ConnectionSettings.h | 6 | ||||
| -rw-r--r-- | qpid/cpp/include/qmf/engine/QmfEngineImportExport.h | 25 |
3 files changed, 14 insertions, 21 deletions
diff --git a/qpid/cpp/include/qmf/Subscription.h b/qpid/cpp/include/qmf/Subscription.h index 398a45b922..580a5ea296 100644 --- a/qpid/cpp/include/qmf/Subscription.h +++ b/qpid/cpp/include/qmf/Subscription.h @@ -9,9 +9,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY diff --git a/qpid/cpp/include/qmf/engine/ConnectionSettings.h b/qpid/cpp/include/qmf/engine/ConnectionSettings.h index 36312400b1..c570a6b9f5 100644 --- a/qpid/cpp/include/qmf/engine/ConnectionSettings.h +++ b/qpid/cpp/include/qmf/engine/ConnectionSettings.h @@ -9,9 +9,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -34,7 +34,7 @@ namespace engine { * * \ingroup qmfapi */ - class ConnectionSettings { + class QMFE_CLASS_EXTERN ConnectionSettings { public: /** diff --git a/qpid/cpp/include/qmf/engine/QmfEngineImportExport.h b/qpid/cpp/include/qmf/engine/QmfEngineImportExport.h index cf8fffdb17..580f805bba 100644 --- a/qpid/cpp/include/qmf/engine/QmfEngineImportExport.h +++ b/qpid/cpp/include/qmf/engine/QmfEngineImportExport.h @@ -20,23 +20,16 @@ * under the License. */ -#if defined(WIN32) && !defined(QPID_DECLARE_STATIC) -# if defined(QMF_EXPORT) || defined (qmfengine_EXPORTS) -# define QMFE_EXTERN __declspec(dllexport) -# else -# define QMFE_EXTERN __declspec(dllimport) -# endif -# ifdef _MSC_VER -# define QMFE_CLASS_EXTERN -# define QMFE_INLINE_EXTERN QMFE_EXTERN -# else -# define QMFE_CLASS_EXTERN QMFE_EXTERN -# define QMFE_INLINE_EXTERN -# endif +#include "qpid/ImportExport.h" + +#if defined(QMF_EXPORT) || defined (qmfengine_EXPORTS) +# define QMFE_EXTERN QPID_EXPORT +# define QMFE_CLASS_EXTERN QPID_CLASS_EXPORT +# define QMFE_INLINE_EXTERN QPID_INLINE_EXPORT #else -# define QMFE_EXTERN -# define QMFE_CLASS_EXTERN -# define QMFE_INLINE_EXTERN +# define QMFE_EXTERN QPID_IMPORT +# define QMFE_CLASS_EXTERN QPID_CLASS_IMPORT +# define QMFE_INLINE_EXTERN QPID_INLINE_IMPORT #endif #endif |