diff options
| author | Andrew Stitcher <astitcher@apache.org> | 2009-05-05 22:13:18 +0000 |
|---|---|---|
| committer | Andrew Stitcher <astitcher@apache.org> | 2009-05-05 22:13:18 +0000 |
| commit | 8da2392961daf55549b57a8c576f66df206f2c69 (patch) | |
| tree | c3c9bfd3743b2e71c9154d71e909df66138c41d3 /cpp/src/qpid/sys/windows/uuid.cpp | |
| parent | 6449200008e62c315abe8e2630ae46eb00597003 (diff) | |
| download | qpid-python-8da2392961daf55549b57a8c576f66df206f2c69.tar.gz | |
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
Diffstat (limited to 'cpp/src/qpid/sys/windows/uuid.cpp')
| -rw-r--r-- | cpp/src/qpid/sys/windows/uuid.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
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 <Rpc.h> +#ifdef uuid_t /* Done in rpcdce.h */ +# undef uuid_t +#endif + #include "uuid.h" #include <string.h> |