[Vm-dev] [commit] r2567 - uuid plugin looks for uuid/uuid.h

[commits at squeakvm.org]

Author: piumarta
Date: 2012-07-30 12:02:29 -0700 (Mon, 30 Jul 2012)
New Revision: 2567

Modified:
   trunk/platforms/unix/plugins/UUIDPlugin/config.cmake
   trunk/platforms/unix/plugins/UUIDPlugin/sqUnixUUID.c
Log:
uuid plugin looks for uuid/uuid.h

Modified: trunk/platforms/unix/plugins/UUIDPlugin/config.cmake
===================================================================
--- trunk/platforms/unix/plugins/UUIDPlugin/config.cmake	2012-07-30 18:35:52 UTC (rev 2566)
+++ trunk/platforms/unix/plugins/UUIDPlugin/config.cmake	2012-07-30 19:02:29 UTC (rev 2567)
@@ -1,9 +1,12 @@
-PLUGIN_FIND_INCLUDE (UUID uuid.h /usr/include/uuid)
+PLUGIN_FIND_INCLUDE (UUID uuid.h)
 CONFIG_DEFINE (HAVE_UUID_H)
 
 PLUGIN_FIND_INCLUDE (SYS_UUID sys/uuid.h)
 CONFIG_DEFINE (HAVE_SYS_UUID_H)
 
+PLUGIN_FIND_INCLUDE (SYS_UUID uuid/uuid.h)
+CONFIG_DEFINE (HAVE_UUID_UUID_H)
+
 PLUGIN_FIND_LIBRARY (UUID uuid)
 
 IF (HAVE_LIBUUID)
@@ -20,4 +23,3 @@
 #   SET (HAVE_UUID_GENERATE 1)
 #   PLUGIN_LINK_LIBRARIES (uuid)
 # ENDIF (UUID_UUID_GENERATE)
-

Modified: trunk/platforms/unix/plugins/UUIDPlugin/sqUnixUUID.c
===================================================================
--- trunk/platforms/unix/plugins/UUIDPlugin/sqUnixUUID.c	2012-07-30 18:35:52 UTC (rev 2566)
+++ trunk/platforms/unix/plugins/UUIDPlugin/sqUnixUUID.c	2012-07-30 19:02:29 UTC (rev 2567)
@@ -1,9 +1,14 @@
 #include "config.h"
 
+#if defined(HAVE_UUID_UUID_H)
+# include <uuid/uuid.h>
+#endif
+
 #if defined(HAVE_SYS_UUID_H)
 # include <sys/types.h>
 # include <sys/uuid.h>
 #endif
+
 #if defined(HAVE_UUID_H)
   #include <uuid.h>
 #endif