[Vm-dev] [commit] r2602 - always use uuidgen or uuid_generate before uuid_create, if available

[commits at squeakvm.org]

Author: piumarta
Date: 2012-09-13 12:21:53 -0700 (Thu, 13 Sep 2012)
New Revision: 2602

Modified:
   trunk/platforms/unix/ChangeLog
   trunk/platforms/unix/plugins/UUIDPlugin/sqUnixUUID.c
Log:
always use uuidgen or uuid_generate before uuid_create, if available

Modified: trunk/platforms/unix/ChangeLog
===================================================================
--- trunk/platforms/unix/ChangeLog	2012-09-13 18:55:29 UTC (rev 2601)
+++ trunk/platforms/unix/ChangeLog	2012-09-13 19:21:53 UTC (rev 2602)
@@ -1,3 +1,8 @@
+2012-09-14    <piumarta at netbsd32>
+
+	* plugins/UUIDPlugin/sqUnixUUID.c (MakeUUID): Always prefer
+	uuidgen or uuid_generate to uuid_create.
+
 2012-09-14  Ian Piumarta  <piumarta at openbsd32.my.domain>
 
 	* vm/config.cmake: Check for and use libiconv if available.

Modified: trunk/platforms/unix/plugins/UUIDPlugin/sqUnixUUID.c
===================================================================
--- trunk/platforms/unix/plugins/UUIDPlugin/sqUnixUUID.c	2012-09-13 18:55:29 UTC (rev 2601)
+++ trunk/platforms/unix/plugins/UUIDPlugin/sqUnixUUID.c	2012-09-13 19:21:53 UTC (rev 2602)
@@ -16,7 +16,7 @@
 
 int MakeUUID(char *location)
 {
-#if defined(HAVE_UUID_CREATE)
+#if defined(HAVE_UUID_CREATE) && !defined(HAVE_UUIDGEN) && !defined(HAVE_UUID_GENERATE)
   size_t  len= 16;	/* 128 bits */
   uuid_t *uuid;
   uuid_create(&uuid);