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/client | |
| 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/client')
| -rw-r--r-- | cpp/src/qpid/client/ClientImportExport.h | 2 | ||||
| -rw-r--r-- | cpp/src/qpid/client/LoadPlugins.cpp | 5 | ||||
| -rw-r--r-- | cpp/src/qpid/client/SslConnector.cpp | 3 |
3 files changed, 6 insertions, 4 deletions
diff --git a/cpp/src/qpid/client/ClientImportExport.h b/cpp/src/qpid/client/ClientImportExport.h index 0e6e5660d6..3b311655ab 100644 --- a/cpp/src/qpid/client/ClientImportExport.h +++ b/cpp/src/qpid/client/ClientImportExport.h @@ -21,7 +21,7 @@ */ #if defined(WIN32) && !defined(QPID_DECLARE_STATIC) -#if defined(CLIENT_EXPORT) +#if defined(CLIENT_EXPORT) || defined (qpidclient_EXPORTS) #define QPID_CLIENT_EXTERN __declspec(dllexport) #else #define QPID_CLIENT_EXTERN __declspec(dllimport) diff --git a/cpp/src/qpid/client/LoadPlugins.cpp b/cpp/src/qpid/client/LoadPlugins.cpp index b395226859..eca6aa47fc 100644 --- a/cpp/src/qpid/client/LoadPlugins.cpp +++ b/cpp/src/qpid/client/LoadPlugins.cpp @@ -19,6 +19,7 @@ * */ +#include "config.h" #include "qpid/Modules.h" #include "qpid/sys/Shlib.h" #include <string> @@ -30,9 +31,9 @@ namespace { struct LoadtimeInitialise { LoadtimeInitialise() { - qpid::ModuleOptions moduleOptions(MODULE_DIR); + qpid::ModuleOptions moduleOptions(QPIDC_MODULE_DIR); string defaultPath (moduleOptions.loadDir); - moduleOptions.parse (0, 0, CONF_FILE, true); + moduleOptions.parse (0, 0, QPIDC_CONF_FILE, true); for (vector<string>::iterator iter = moduleOptions.load.begin(); iter != moduleOptions.load.end(); diff --git a/cpp/src/qpid/client/SslConnector.cpp b/cpp/src/qpid/client/SslConnector.cpp index a4298dd4ca..7b0bcc6f1e 100644 --- a/cpp/src/qpid/client/SslConnector.cpp +++ b/cpp/src/qpid/client/SslConnector.cpp @@ -20,6 +20,7 @@ */ #include "Connector.h" +#include "config.h" #include "Bounds.h" #include "ConnectionImpl.h" #include "ConnectionSettings.h" @@ -146,7 +147,7 @@ namespace { StaticInit() { try { SslOptions options; - options.parse (0, 0, CONF_FILE, true); + options.parse (0, 0, QPIDC_CONF_FILE, true); if (options.certDbPath.empty()) { QPID_LOG(info, "SSL connector not enabled, you must set QPID_SSL_CERT_DB to enable it."); } else { |