summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/Makefile.am12
-rw-r--r--cpp/src/qpid/sys/posix/PosixAcceptor.cpp2
2 files changed, 10 insertions, 4 deletions
diff --git a/cpp/src/Makefile.am b/cpp/src/Makefile.am
index 2c95033661..99250e15ad 100644
--- a/cpp/src/Makefile.am
+++ b/cpp/src/Makefile.am
@@ -43,9 +43,15 @@ posix_hdr = \
qpid/sys/posix/EventChannel.h \
qpid/sys/posix/EventChannelThreads.h
-EXTRA_DIST=$(posix_src) $(posix_hdr)
-platform_src = $(apr_src)
-platform_hdr = $(apr_hdr)
+if USE_APR
+ EXTRA_DIST=$(posix_src) $(posix_hdr)
+ platform_src = $(apr_src)
+ platform_hdr = $(apr_hdr)
+else
+ EXTRA_DIST=$(apr_src) $(apr_hdr)
+ platform_src = $(posix_src)
+ platform_hdr = $(posix_hdr)
+endif
lib_LTLIBRARIES = libqpidcommon.la libqpidbroker.la libqpidclient.la
diff --git a/cpp/src/qpid/sys/posix/PosixAcceptor.cpp b/cpp/src/qpid/sys/posix/PosixAcceptor.cpp
index b5f6c6ee83..af200d393d 100644
--- a/cpp/src/qpid/sys/posix/PosixAcceptor.cpp
+++ b/cpp/src/qpid/sys/posix/PosixAcceptor.cpp
@@ -31,7 +31,7 @@ void fail() { throw qpid::Exception("PosixAcceptor not implemented"); }
class PosixAcceptor : public Acceptor {
public:
- virtual int16_t getPort() const { fail(); return 0; }
+ virtual uint16_t getPort() const { fail(); return 0; }
virtual void run(qpid::sys::ConnectionInputHandlerFactory* ) { fail(); }
virtual void shutdown() { fail(); }
};