diff options
| author | Stephen D. Huston <shuston@apache.org> | 2009-04-23 22:59:12 +0000 |
|---|---|---|
| committer | Stephen D. Huston <shuston@apache.org> | 2009-04-23 22:59:12 +0000 |
| commit | 3c95f9a289fee6a3b43608ec2ac95f841c43e3ff (patch) | |
| tree | 5860c778c3e2b2c6c23b49887ae870cb5d4558ff /cpp/src/qpid/broker | |
| parent | 7db52d95099fb7ae237277f12e4e368cf643f174 (diff) | |
| download | qpid-python-3c95f9a289fee6a3b43608ec2ac95f841c43e3ff.tar.gz | |
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
Diffstat (limited to 'cpp/src/qpid/broker')
| -rw-r--r-- | cpp/src/qpid/broker/BrokerImportExport.h | 2 |
1 files changed, 1 insertions, 1 deletions
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) |