Revision
16030
Author
jlenk
Date
2009-12-22 15:47:58 -0600 (Tue, 22 Dec 2009)

Log Message

Windows UUID

Modified Paths

Diff

Modified: freeswitch/trunk/src/switch_apr.c (16029 => 16030)


--- freeswitch/trunk/src/switch_apr.c	2009-12-22 21:44:46 UTC (rev 16029)
+++ freeswitch/trunk/src/switch_apr.c	2009-12-22 21:47:58 UTC (rev 16030)
@@ -870,17 +870,32 @@
 
 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)