From: Jeff Lenk Date: Tue, 22 Dec 2009 21:47:58 +0000 (+0000) Subject: Windows UUID X-Git-Tag: v1.0.6~936 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=71cb806239471a2b29b021512b6d7a5fe4d57256;p=thirdparty%2Ffreeswitch.git Windows UUID git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@16030 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- diff --git a/src/switch_apr.c b/src/switch_apr.c index 47a21d022f..593bf37094 100644 --- a/src/switch_apr.c +++ b/src/switch_apr.c @@ -870,17 +870,32 @@ SWITCH_DECLARE(switch_status_t) switch_socket_create_pollfd(switch_pollfd_t **po SWITCH_DECLARE(void) switch_uuid_format(char *buffer, const switch_uuid_t *uuid) { +#ifndef WIN32 apr_uuid_format(buffer, (const apr_uuid_t *) uuid); +#else + RPC_CSTR buf; + UuidToString((const UUID*)uuid, &buf); + strcpy(buffer, (const char*)buf); + RpcStringFree(&buf); +#endif } SWITCH_DECLARE(void) switch_uuid_get(switch_uuid_t *uuid) { +#ifndef WIN32 apr_uuid_get((apr_uuid_t *) uuid); +#else + UuidCreate((UUID*)uuid); +#endif } SWITCH_DECLARE(switch_status_t) switch_uuid_parse(switch_uuid_t *uuid, const char *uuid_str) { - return apr_uuid_parse((apr_uuid_t *) uuid, uuid_str); +#ifndef WIN32 + apr_uuid_parse((apr_uuid_t *) uuid, uuid_str); +#else + return UuidFromString((RPC_CSTR)uuid_str, (UUID*)uuid); +#endif } SWITCH_DECLARE(switch_status_t) switch_md5(unsigned char digest[SWITCH_MD5_DIGESTSIZE], const void *input, switch_size_t inputLen)