From 3c95f9a289fee6a3b43608ec2ac95f841c43e3ff Mon Sep 17 00:00:00 2001 From: "Stephen D. Huston" Date: Thu, 23 Apr 2009 22:59:12 +0000 Subject: Merge in initial changes to allow building with CMake; rubygen and managementgen can now generate either .mk files or .cmake files as needed; CONF_FILE and MODULE_DIR macros now have broker/client counterparts QPIDD_CONF_FILE, QPIDD_MODULE_DIR, QPIDC_CONF_FILE, QPIDC_MODULE_DIR configurable by cmake git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@768085 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/qpid/broker/BrokerImportExport.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cpp/src/qpid/broker') diff --git a/cpp/src/qpid/broker/BrokerImportExport.h b/cpp/src/qpid/broker/BrokerImportExport.h index 2edc90993e..4edf8c9844 100644 --- a/cpp/src/qpid/broker/BrokerImportExport.h +++ b/cpp/src/qpid/broker/BrokerImportExport.h @@ -21,7 +21,7 @@ */ #if defined(WIN32) && !defined(QPID_BROKER_STATIC) -#if defined(BROKER_EXPORT) +#if defined(BROKER_EXPORT) || defined (qpidbroker_EXPORTS) #define QPID_BROKER_EXTERN __declspec(dllexport) #else #define QPID_BROKER_EXTERN __declspec(dllimport) -- cgit v1.2.1