diff options
| author | Gordon Sim <gsim@apache.org> | 2009-05-18 15:28:03 +0000 |
|---|---|---|
| committer | Gordon Sim <gsim@apache.org> | 2009-05-18 15:28:03 +0000 |
| commit | a4be3f4df943ec661040acdcca429c7734eca381 (patch) | |
| tree | 3e1804132bbc86d5111cc70075e7db7f188cda50 /cpp | |
| parent | 07c653a04954bc61e25557f89d5b18a3925f3dac (diff) | |
| download | qpid-python-a4be3f4df943ec661040acdcca429c7734eca381.tar.gz | |
Fix includes to allow for alternative packaging for nspr/nss.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@775985 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/src/qpid/sys/ssl/SslSocket.cpp | 10 | ||||
| -rw-r--r-- | cpp/src/qpid/sys/ssl/SslSocket.h | 2 | ||||
| -rw-r--r-- | cpp/src/qpid/sys/ssl/check.h | 4 | ||||
| -rw-r--r-- | cpp/src/qpid/sys/ssl/util.cpp | 8 | ||||
| -rw-r--r-- | cpp/src/ssl.mk | 2 |
5 files changed, 13 insertions, 13 deletions
diff --git a/cpp/src/qpid/sys/ssl/SslSocket.cpp b/cpp/src/qpid/sys/ssl/SslSocket.cpp index dc816b403b..8cbbc800e7 100644 --- a/cpp/src/qpid/sys/ssl/SslSocket.cpp +++ b/cpp/src/qpid/sys/ssl/SslSocket.cpp @@ -37,11 +37,11 @@ #include <string.h> #include <iostream> -#include <nspr4/private/pprio.h> -#include <nss3/nss.h> -#include <nss3/pk11pub.h> -#include <nss3/ssl.h> -#include <nss3/key.h> +#include <private/pprio.h> +#include <nss.h> +#include <pk11pub.h> +#include <ssl.h> +#include <key.h> #include <boost/format.hpp> diff --git a/cpp/src/qpid/sys/ssl/SslSocket.h b/cpp/src/qpid/sys/ssl/SslSocket.h index 7434667b78..a0e73e8181 100644 --- a/cpp/src/qpid/sys/ssl/SslSocket.h +++ b/cpp/src/qpid/sys/ssl/SslSocket.h @@ -23,7 +23,7 @@ */ #include "qpid/sys/IOHandle.h" -#include <nspr4/nspr.h> +#include <nspr.h> #include <string> diff --git a/cpp/src/qpid/sys/ssl/check.h b/cpp/src/qpid/sys/ssl/check.h index 6217a39429..984c338a18 100644 --- a/cpp/src/qpid/sys/ssl/check.h +++ b/cpp/src/qpid/sys/ssl/check.h @@ -23,8 +23,8 @@ */ #include <iostream> #include <string> -#include <nspr4/nspr.h> -#include <nss3/nss.h> +#include <nspr.h> +#include <nss.h> namespace qpid { namespace sys { diff --git a/cpp/src/qpid/sys/ssl/util.cpp b/cpp/src/qpid/sys/ssl/util.cpp index 97b00f19de..263f596aeb 100644 --- a/cpp/src/qpid/sys/ssl/util.cpp +++ b/cpp/src/qpid/sys/ssl/util.cpp @@ -24,10 +24,10 @@ #include "qpid/sys/SystemInfo.h" #include <unistd.h> -#include <nspr4/nspr.h> -#include <nss3/nss.h> -#include <nss3/pk11pub.h> -#include <nss3/ssl.h> +#include <nspr.h> +#include <nss.h> +#include <pk11pub.h> +#include <ssl.h> #include <iostream> #include <fstream> diff --git a/cpp/src/ssl.mk b/cpp/src/ssl.mk index fa94814f75..f7fba7bd35 100644 --- a/cpp/src/ssl.mk +++ b/cpp/src/ssl.mk @@ -56,7 +56,7 @@ sslconnector_la_LIBADD = \ libqpidclient.la \ libsslcommon.la -sslconnector_la_CXXFLAGS = $(AM_CXXFLAGS) -DQPIDC_CONF_FILE=\"$(confdir)/qpidc.conf\" +sslconnector_la_CXXFLAGS = $(AM_CXXFLAGS) -DQPIDC_CONF_FILE=\"$(confdir)/qpidc.conf\" $(SSL_CFLAGS) sslconnector_la_LDFLAGS = $(PLUGINLDFLAGS) |