From 8da2392961daf55549b57a8c576f66df206f2c69 Mon Sep 17 00:00:00 2001 From: Andrew Stitcher Date: Tue, 5 May 2009 22:13:18 +0000 Subject: 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 --- cpp/src/qpid/agent/QmfAgentImportExport.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cpp/src/qpid/agent') 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 -- cgit v1.2.1