[Vm-dev] [commit] r2570 - do not include uuid.h if uuid/uuid.h is available

commits at squeakvm.org commits at squeakvm.org
Mon Jul 30 19:36:47 UTC 2012


Author: piumarta
Date: 2012-07-30 12:36:47 -0700 (Mon, 30 Jul 2012)
New Revision: 2570

Modified:
   trunk/platforms/unix/plugins/UUIDPlugin/sqUnixUUID.c
Log:
do not include uuid.h if uuid/uuid.h is available

Modified: trunk/platforms/unix/plugins/UUIDPlugin/sqUnixUUID.c
===================================================================
--- trunk/platforms/unix/plugins/UUIDPlugin/sqUnixUUID.c	2012-07-30 19:28:56 UTC (rev 2569)
+++ trunk/platforms/unix/plugins/UUIDPlugin/sqUnixUUID.c	2012-07-30 19:36:47 UTC (rev 2570)
@@ -1,16 +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>
+#if defined(HAVE_UUID_UUID_H)
+# include <uuid/uuid.h>
+#elif defined(HAVE_UUID_H)
+# include <uuid.h>
 #endif
 
 #include "sq.h"



More information about the Vm-dev mailing list