diff options
| author | Andrew Stitcher <astitcher@apache.org> | 2009-05-05 22:13:18 +0000 |
|---|---|---|
| committer | Andrew Stitcher <astitcher@apache.org> | 2009-05-05 22:13:18 +0000 |
| commit | 8da2392961daf55549b57a8c576f66df206f2c69 (patch) | |
| tree | c3c9bfd3743b2e71c9154d71e909df66138c41d3 /cpp/src/qpid/agent | |
| parent | 6449200008e62c315abe8e2630ae46eb00597003 (diff) | |
| download | qpid-python-8da2392961daf55549b57a8c576f66df206f2c69.tar.gz | |
Hack around the namespace pollution in QPID-1737
Hack around simultaneous import and definition of ManagementAgent::Singleton in qpidbroker
Make ACL plugin optional (default off on Windows currently)
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@771989 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/qpid/agent')
| -rw-r--r-- | cpp/src/qpid/agent/QmfAgentImportExport.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/qpid/agent/QmfAgentImportExport.h b/cpp/src/qpid/agent/QmfAgentImportExport.h index 9eee4a18fd..e614e09d6d 100644 --- a/cpp/src/qpid/agent/QmfAgentImportExport.h +++ b/cpp/src/qpid/agent/QmfAgentImportExport.h @@ -20,7 +20,7 @@ * under the License. */ -#if defined(WIN32) && !defined(QPID_DECLARE_STATIC) +#if defined(WIN32) && !defined(QPID_DECLARE_STATIC) && !defined(qpidbroker_EXPORTS) #if defined(QMF_AGENT_EXPORT) || defined (qmfagent_EXPORTS) #define QMF_AGENT_EXTERN __declspec(dllexport) #else |