diff options
| author | Stephen D. Huston <shuston@apache.org> | 2010-01-18 22:40:15 +0000 |
|---|---|---|
| committer | Stephen D. Huston <shuston@apache.org> | 2010-01-18 22:40:15 +0000 |
| commit | 98cdefe499d1698487c3986a90cb2567a3d70fff (patch) | |
| tree | 9de4a700679e20a0c028c55783ea0a6c5ec518c3 | |
| parent | 030cb99685701e565ef0e0e3ded0356b9d63054a (diff) | |
| download | qpid-python-98cdefe499d1698487c3986a90cb2567a3d70fff.tar.gz | |
Correct new uuid methods for Windows, add QPID_CLIENT_EXTERN where needed.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@900592 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | cpp/src/qpid/sys/windows/uuid.cpp | 3 | ||||
| -rw-r--r-- | cpp/src/qpid/sys/windows/uuid.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/cpp/src/qpid/sys/windows/uuid.cpp b/cpp/src/qpid/sys/windows/uuid.cpp index af202d60b6..b5360622dc 100644 --- a/cpp/src/qpid/sys/windows/uuid.cpp +++ b/cpp/src/qpid/sys/windows/uuid.cpp @@ -58,5 +58,6 @@ void uuid_unparse (const uuid_t uu, char *out) { } int uuid_compare (const uuid_t a, const uuid_t b) { - return memcmp(a, b, qpid::sys::UuidSize) == 0; + RPC_STATUS unused; + return !UuidEqual((UUID*)a, (UUID*)b, &unused); } diff --git a/cpp/src/qpid/sys/windows/uuid.h b/cpp/src/qpid/sys/windows/uuid.h index 249c534b91..9c32814182 100644 --- a/cpp/src/qpid/sys/windows/uuid.h +++ b/cpp/src/qpid/sys/windows/uuid.h @@ -34,6 +34,6 @@ QPID_COMMON_EXTERN void uuid_generate (uuid_t out); QPID_COMMON_EXTERN int uuid_is_null (const uuid_t uu); // Returns 1 if null, else 0 QPID_COMMON_EXTERN int uuid_parse (const char *in, uuid_t uu); // Returns 0 on success, else -1 QPID_COMMON_EXTERN void uuid_unparse (const uuid_t uu, char *out); -QPID_COMMON_EXTERN void uuid_compare (const uuid_t a, const uuid_t b); +QPID_COMMON_EXTERN int uuid_compare (const uuid_t a, const uuid_t b); #endif /*!_sys_windows_uuid_h*/ |