summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cpp/src/qmf/Hash.h2
-rw-r--r--cpp/src/qpid/sys/Shlib.h1
-rwxr-xr-xcpp/src/qpid/sys/posix/SystemInfo.cpp1
3 files changed, 3 insertions, 1 deletions
diff --git a/cpp/src/qmf/Hash.h b/cpp/src/qmf/Hash.h
index e1eff84117..4bd76832aa 100644
--- a/cpp/src/qmf/Hash.h
+++ b/cpp/src/qmf/Hash.h
@@ -29,7 +29,7 @@ namespace qmf {
class Hash {
public:
Hash();
- qpid::types::Uuid asUuid() const { return qpid::types::Uuid((unsigned char*) data); }
+ qpid::types::Uuid asUuid() const { return qpid::types::Uuid((const unsigned char*) data); }
void update(const char* s, uint32_t len);
void update(uint8_t v) { update((char*) &v, sizeof(v)); }
void update(uint32_t v) { update((char*) &v, sizeof(v)); }
diff --git a/cpp/src/qpid/sys/Shlib.h b/cpp/src/qpid/sys/Shlib.h
index 7f66cfec14..2ce5a49fcb 100644
--- a/cpp/src/qpid/sys/Shlib.h
+++ b/cpp/src/qpid/sys/Shlib.h
@@ -23,6 +23,7 @@
*/
#include "qpid/CommonImportExport.h"
+#include "qpid/sys/IntegerTypes.h"
#include <boost/noncopyable.hpp>
#include <iostream>
diff --git a/cpp/src/qpid/sys/posix/SystemInfo.cpp b/cpp/src/qpid/sys/posix/SystemInfo.cpp
index a19ab6885c..540cc8bc91 100755
--- a/cpp/src/qpid/sys/posix/SystemInfo.cpp
+++ b/cpp/src/qpid/sys/posix/SystemInfo.cpp
@@ -28,6 +28,7 @@
#include <sys/socket.h> // For FreeBSD
#include <netinet/in.h> // For FreeBSD
#include <ifaddrs.h>
+#include <unistd.h>
#include <iostream>
#include <fstream>
#include <sstream>