Merge pull request #1907 from bluca/kfreebsd

Problem: debian-kfreebsd build broken
zeromq · Apr 29, 2018 · bfc5af6 · bfc5af6
2 parents f5df69d + 285c515
commit bfc5af6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/include/czmq_prelude.h b/include/czmq_prelude.h
@@ -695,10 +695,7 @@ char *if_indextoname (unsigned int ifindex, char *ifname);
 #if defined (__UTYPE_OSX) && !defined (HAVE_UUID)
 #   define HAVE_UUID 1
 #endif
-#if defined (__UTYPE_FREEBSD) && !defined (HAVE_UUID)
-#   define HAVE_UUID 1
-#endif
-#if defined (HAVE_UUID)
+#if defined (HAVE_UUID) || defined (__UTYPE_FREEBSD)
 #   if defined (__UTYPE_FREEBSD) || defined (__UTYPE_NETBSD) || defined(__UTYPE_OPENBSD)
 #       include <uuid.h>
 #   elif defined __UTYPE_HPUX

diff --git a/src/zuuid.c b/src/zuuid.c
@@ -47,7 +47,7 @@ zuuid_new (void)
     assert (sizeof (uuid) == ZUUID_LEN);
     UuidCreate (&uuid);
     zuuid_set (self, (byte *) &uuid);
-#elif defined (HAVE_UUID) && !defined (__UTYPE_FREEBSD)
+#elif defined (HAVE_UUID)
     uuid_t uuid;
     assert (sizeof (uuid) == ZUUID_LEN);
     uuid_generate (uuid);