From 8da2392961daf55549b57a8c576f66df206f2c69 Mon Sep 17 00:00:00 2001 From: Andrew Stitcher Date: Tue, 5 May 2009 22:13:18 +0000 Subject: Hack around the namespace pollution in QPID-1737 Hack around simultaneous import and definition of ManagementAgent::Singleton in qpidbroker Make ACL plugin optional (default off on Windows currently) git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@771989 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/qpid/sys/windows/uuid.cpp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'cpp/src/qpid/sys/windows/uuid.cpp') diff --git a/cpp/src/qpid/sys/windows/uuid.cpp b/cpp/src/qpid/sys/windows/uuid.cpp index 92f60e04b1..4d8184c703 100644 --- a/cpp/src/qpid/sys/windows/uuid.cpp +++ b/cpp/src/qpid/sys/windows/uuid.cpp @@ -19,6 +19,11 @@ * */ +#include +#ifdef uuid_t /* Done in rpcdce.h */ +# undef uuid_t +#endif + #include "uuid.h" #include -- cgit v1.2.1